b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-04-08 00:17:24 +00:00 committed by GitHub
parent 6e4d572602 d70959a2e2
commit 8d1d992273
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 1712 additions and 1320 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
maintainers/team-list.nix
View file

@ -87,6 +87,16 @@ with lib.maintainers; {
scope = "Maintain GNOME desktop environment and platform."; scope = "Maintain GNOME desktop environment and platform.";
}; };
home-assistant = {
members = [
fab
globin
hexa
mic92
];
scope = "Maintain the Home Assistant ecosystem";
};
jitsi = { jitsi = {
members = [ members = [
mmilata mmilata

9
nixos/modules/hardware/video/amdgpu.nix
View file

@ -1,9 +0,0 @@
{ config, lib, ... }:
with lib;
{
config = mkIf (elem "amdgpu" config.services.xserver.videoDrivers) {
boot.blacklistedKernelModules = [ "radeon" ];
};
}

1
nixos/modules/module-list.nix
View file

@ -74,7 +74,6 @@
./hardware/sata.nix ./hardware/sata.nix
./hardware/wooting.nix ./hardware/wooting.nix
./hardware/uinput.nix ./hardware/uinput.nix
./hardware/video/amdgpu.nix
./hardware/video/amdgpu-pro.nix ./hardware/video/amdgpu-pro.nix
./hardware/video/ati.nix ./hardware/video/ati.nix
./hardware/video/capture/mwprocapture.nix ./hardware/video/capture/mwprocapture.nix

8
nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json
View file

@ -8,7 +8,13 @@
} }
], ],
"actions": { "actions": {
"update-props": {} "update-props": {
"bluez5.reconnect-profiles": [
"hfp_hf",
"hsp_hs",
"a2dp_sink"
]
}
} }
}, },
{ {

2
nixos/modules/services/misc/home-assistant.nix
View file

@ -63,7 +63,7 @@ let
}; };
in { in {
meta.maintainers = with maintainers; [ ]; meta.maintainers = teams.home-assistant.members;
options.services.home-assistant = { options.services.home-assistant = {
enable = mkEnableOption "Home Assistant"; enable = mkEnableOption "Home Assistant";

1
nixos/modules/services/networking/tailscale.nix
View file

@ -28,6 +28,7 @@ in {
systemd.packages = [ cfg.package ]; systemd.packages = [ cfg.package ];
systemd.services.tailscaled = { systemd.services.tailscaled = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ pkgs.openresolv ];
serviceConfig.Environment = "PORT=${toString cfg.port}"; serviceConfig.Environment = "PORT=${toString cfg.port}";
}; };
}; };

4
pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bitwig-studio"; pname = "bitwig-studio";
version = "3.3.6"; version = "3.3.7";
src = fetchurl { src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
sha256 = "sha256-k7L6CU2lY9192tfaWtVOxq9BCY7FZZdxmHT8EA+ZFsk="; sha256 = "13jr45kzv0xjhhqk30qpq793349qyx8jpas4kl6i6bk3xfrd3fbz";
}; };
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];

7
pkgs/applications/audio/noisetorch/default.nix
View file

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "NoiseTorch"; pname = "NoiseTorch";
version = "0.9.0"; version = "0.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lawl"; owner = "lawl";
@ -11,7 +11,10 @@ buildGoModule rec {
sha256 = "1a4g112h83m55pga8kq2a1wzxpycj59v4bygyjfyi1s09q1y97qg"; sha256 = "1a4g112h83m55pga8kq2a1wzxpycj59v4bygyjfyi1s09q1y97qg";
}; };
patches = [ ./version.patch ]; patches = [
# Get version from environment instead of git tags
./version.patch
];
vendorSha256 = null; vendorSha256 = null;

4
pkgs/applications/editors/sublime/2/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
if stdenv.hostPlatform.system == "i686-linux" then if stdenv.hostPlatform.system == "i686-linux" then
fetchurl { fetchurl {
name = "sublimetext-2.0.2.tar.bz2"; name = "sublimetext-2.0.2.tar.bz2";
url = [ urls = [
"http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2"
"https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2" "https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2"
]; ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
else else
fetchurl { fetchurl {
name = "sublimetext-2.0.2.tar.bz2"; name = "sublimetext-2.0.2.tar.bz2";
url = [ urls = [
"http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2"
"https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2" "https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2"
]; ];

67
pkgs/applications/misc/viking/default.nix
View file

@ -1,60 +1,57 @@
{ fetchurl, fetchpatch, lib, stdenv, makeWrapper { lib, stdenv, fetchurl
, pkg-config, intltool, gettext, gtk2, expat, curl , docbook_xml_dtd_45, docbook_xsl, intltool, itstool, libxslt, pkg-config, wrapGAppsHook, yelp-tools
, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper , curl, gdk-pixbuf, gtk3, json-glib, libxml2
, docbook_xml_dtd_412, gexiv2, gpsbabel, expect , gpsbabel
, withGeoClue ? true, geoclue2
, withGeoTag ? true, gexiv2
, withMagic ? true, file
, withMapnik ? false, mapnik , withMapnik ? false, mapnik
, withMBTiles ? true, sqlite , withMBTiles ? true, sqlite
, withOAuth ? true, liboauth
, withMd5Hash ? true, nettle , withMd5Hash ? true, nettle
, withGeoClue ? true, geoclue2 }: , withOAuth ? true, liboauth
, withRealtimeGPSTracking ? true, gpsd
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "viking"; pname = "viking";
version = "1.8"; version = "1.9";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2"; url = "mirror://sourceforge/viking/viking-${version}.tar.bz2";
sha256 = "1a0g0fbj4q5s9p8fv0mqvxws10q3naj81l72sz30vvqpbz6vqp45"; sha256 = "0fybpy6k0vmjp231h5ckysl3c0rcnh2afznijwq6y78j4hywyjpy";
}; };
patches = [ nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook yelp-tools ];
# Fix build without mapnik and sqlite https://github.com/viking-gps/viking/pull/79
(fetchpatch {
url = "https://github.com/viking-gps/viking/commit/995feefcb97bdb1590ed018224cf47ce197fe0c1.patch";
sha256 = "1xb0b76kg690fag9mw3yfj5k766jmqp1sm8q4f29n1h3nz5g8izd";
})
];
nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ curl gdk-pixbuf gtk3 json-glib libxml2 ]
buildInputs = [ intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2
] ++ lib.optional withMapnik mapnik
++ lib.optional withGeoClue geoclue2 ++ lib.optional withGeoClue geoclue2
++ lib.optional withGeoTag gexiv2
++ lib.optional withMagic file
++ lib.optional withMapnik mapnik
++ lib.optional withMBTiles sqlite
++ lib.optional withMd5Hash nettle ++ lib.optional withMd5Hash nettle
++ lib.optional withOAuth liboauth ++ lib.optional withOAuth liboauth
++ lib.optional withMBTiles sqlite; ++ lib.optional withRealtimeGPSTracking gpsd;
configureFlags = [ configureFlags = [
"--disable-scrollkeeper"
(lib.enableFeature withMapnik "mapnik")
(lib.enableFeature withGeoClue "geoclue") (lib.enableFeature withGeoClue "geoclue")
(lib.enableFeature withMd5Hash "nettle") (lib.enableFeature withGeoTag "geotag")
(lib.enableFeature withOAuth "oauth") (lib.enableFeature withMagic "magic")
(lib.enableFeature withMapnik "mapnik")
(lib.enableFeature withMBTiles "mbtiles") (lib.enableFeature withMBTiles "mbtiles")
(lib.enableFeature withMd5Hash "nettle")
(lib.enableFeature withOAuth "oauth")
(lib.enableFeature withRealtimeGPSTracking "realtime-gps-tracking")
]; ];
preBuild = '' hardeningDisable = [ "format" ];
sed -i help/Makefile \
-e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g'
sed -i help/Makefile -e 's|--postvalid||g'
'';
doCheck = true; doCheck = true;
postInstall = '' preFixup = ''
wrapProgram $out/bin/viking \ gappsWrapperArgs+=(
--prefix PATH : "${gpsbabel}/bin" \ --prefix PATH : ${lib.makeBinPath [ gpsbabel ]}
--prefix PATH : "${expect}/bin" )
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/applications/networking/cluster/terraform/default.nix
View file

@ -157,8 +157,8 @@ in rec {
}); });
terraform_0_14 = pluggable (generic { terraform_0_14 = pluggable (generic {
version = "0.14.9"; version = "0.14.10";
sha256 = "0r9d28mbj7h9prr39gm5kd49l7sm8l1ab9rwrkpyhwgr119zf35b"; sha256 = "05vfb8hzma3qxq4w1h25mmgv96g90if214zlar0sm9fq8zsvb1yw";
vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm"; vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm";
patches = [ ./provider-path.patch ]; patches = [ ./provider-path.patch ];
passthru = { inherit plugins; }; passthru = { inherit plugins; };

13
pkgs/applications/version-management/gitlab/data.json
View file

@ -1,13 +1,12 @@
{ {
"version": "13.9.4", "version": "13.10.2",
"repo_hash": "0gwxjmph3ac5v0h5zz8664412yq09cka5p4amdbxk7hna24igksz", "repo_hash": "1q3qnfzhikbbsmzzbldwn6xvsyxr1jgv5lj7mgcji11j8qv1a625",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v13.9.4-ee", "rev": "v13.10.2-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "13.9.4", "GITALY_SERVER_VERSION": "13.10.2",
"GITLAB_PAGES_VERSION": "1.35.0", "GITLAB_PAGES_VERSION": "1.36.0",
"GITLAB_SHELL_VERSION": "13.17.0", "GITLAB_SHELL_VERSION": "13.17.0"
"GITLAB_WORKHORSE_VERSION": "8.63.2"
} }
} }

6
pkgs/applications/version-management/gitlab/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
, ruby, tzdata, git, nettools, nixosTests, nodejs, openssl , ruby, tzdata, git, nettools, nixosTests, nodejs, openssl
, gitlabEnterprise ? false, callPackage, yarn , gitlabEnterprise ? false, callPackage, yarn
, fixup_yarn_lock, replace , fixup_yarn_lock, replace, file
}: }:
let let
@ -32,6 +32,10 @@ let
openssl = x.openssl // { openssl = x.openssl // {
buildInputs = [ openssl ]; buildInputs = [ openssl ];
}; };
ruby-magic-static = x.ruby-magic-static // {
buildInputs = [ file ];
buildFlags = [ "--enable-system-libraries" ];
};
}; };
groups = [ groups = [
"default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos"

2
pkgs/applications/version-management/gitlab/gitaly/Gemfile
View file

@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rugged', '~> 1.0.1' gem 'rugged', '~> 1.1'
gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'github-linguist', '~> 7.12', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.1' gem 'gitlab-markup', '~> 1.7.1'
gem 'activesupport', '~> 6.0.3.4' gem 'activesupport', '~> 6.0.3.4'

4
pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
View file

@ -183,7 +183,7 @@ GEM
rubocop-ast (0.2.0) rubocop-ast (0.2.0)
parser (>= 2.7.0.1) parser (>= 2.7.0.1)
ruby-progressbar (1.10.1) ruby-progressbar (1.10.1)
rugged (1.0.1) rugged (1.1.0)
sanitize (4.6.6) sanitize (4.6.6)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
@ -233,7 +233,7 @@ DEPENDENCIES
rspec rspec
rspec-parameterized rspec-parameterized
rubocop (~> 0.69) rubocop (~> 0.69)
rugged (~> 1.0.1) rugged (~> 1.1)
sentry-raven (~> 3.0) sentry-raven (~> 3.0)
timecop timecop

20
pkgs/applications/version-management/gitlab/gitaly/default.nix
View file

@ -4,18 +4,6 @@
, libgit2, openssl, zlib, pcre, http-parser }: , libgit2, openssl, zlib, pcre, http-parser }:
let let
# libgit2 was updated to 1.1.0 in nixpkgs, but gitlab doesn't support that yet.
# See https://github.com/NixOS/nixpkgs/pull/106909
libgit = libgit2.overrideAttrs (attrs: rec {
version = "1.0.0";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "06cwrw93ycpfb5kisnsa5nsy95pm11dbh0vvdjg1jn25h9q5d3vc";
};
});
rubyEnv = bundlerEnv rec { rubyEnv = bundlerEnv rec {
name = "gitaly-env"; name = "gitaly-env";
inherit ruby; inherit ruby;
@ -33,17 +21,17 @@ let
}; };
}; };
in buildGoModule rec { in buildGoModule rec {
version = "13.9.4"; version = "13.10.2";
pname = "gitaly"; pname = "gitaly";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitaly"; repo = "gitaly";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-6ocP4SMafvLI2jfvcB8jk1AemAI/TiBQ1iaVxK7I54A="; sha256 = "sha256-5CjZs5tpEEsgQGBFa8BeZ7SDhIeGKqAHWwbR8hSoCPs=";
}; };
vendorSha256 = "10ssx0dvbzg70vr2sgnhzijnjxfw6533wdjxwakj62rpfayklp51"; vendorSha256 = "sha256-8AopoiLmg6kfvYbZDOfFWBy1o5tbnxsKxSBX20OasIE=";
passthru = { passthru = {
inherit rubyEnv; inherit rubyEnv;
@ -51,7 +39,7 @@ in buildGoModule rec {
buildFlags = [ "-tags=static,system_libgit2" ]; buildFlags = [ "-tags=static,system_libgit2" ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ]; buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
doCheck = false; doCheck = false;
postInstall = '' postInstall = ''

6
pkgs/applications/version-management/gitlab/gitaly/gemset.nix
View file

@ -829,10 +829,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "056bwiwxvnbkbgsr2wqcsknnc73nqasqdnjcpgj2r61wkm8mzmbn"; sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy";
type = "gem"; type = "gem";
}; };
version = "1.0.1"; version = "1.1.0";
}; };
sanitize = { sanitize = {
dependencies = ["crass" "nokogiri" "nokogumbo"]; dependencies = ["crass" "nokogiri" "nokogumbo"];
@ -953,4 +953,4 @@
}; };
version = "2.4.2"; version = "2.4.2";
}; };
} }

18
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View file

@ -1,18 +1,22 @@
{ lib, fetchFromGitLab, git, buildGoModule }: { lib, fetchFromGitLab, git, buildGoModule }:
let
data = (builtins.fromJSON (builtins.readFile ../data.json));
in
buildGoModule rec { buildGoModule rec {
pname = "gitlab-workhorse"; pname = "gitlab-workhorse";
version = "8.63.2"; version = "13.10.2";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = data.owner;
repo = "gitlab-workhorse"; repo = data.repo;
rev = "v${version}"; rev = data.rev;
sha256 = "1vjk7r7228p2gblx9nmqiz70ckbllg1p3bwkyfd4m49jhp13hryi"; sha256 = data.repo_hash;
}; };
vendorSha256 = "0hc02nxw5jp1mhpjcx1f2a2dfaq7ji4qkf5g7lbpd1rzhqwp6zsz"; sourceRoot = "source/workhorse";
vendorSha256 = "sha256-UCkUSv1ZjDHmTFnETU8dz4moYRDCvy6AYTTfjHBGKeE=";
buildInputs = [ git ]; buildInputs = [ git ];
buildFlagsArray = "-ldflags=-X main.Version=${version}"; buildFlagsArray = "-ldflags=-X main.Version=${version}";
doCheck = false; doCheck = false;

48
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View file

@ -17,7 +17,7 @@ gem 'default_value_for', '~> 3.4.0'
# Supported DBs # Supported DBs
gem 'pg', '~> 1.1' gem 'pg', '~> 1.1'
gem 'rugged', '~> 1.0.1' gem 'rugged', '~> 1.1'
gem 'grape-path-helpers', '~> 1.6.1' gem 'grape-path-helpers', '~> 1.6.1'
gem 'faraday', '~> 1.0' gem 'faraday', '~> 1.0'
@ -25,13 +25,13 @@ gem 'marginalia', '~> 1.10.0'
# Authentication libraries # Authentication libraries
gem 'devise', '~> 4.7.2' gem 'devise', '~> 4.7.2'
# TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828) gem 'bcrypt', '~> 3.1', '>= 3.1.14'
gem 'bcrypt', '3.1.12'
gem 'doorkeeper', '~> 5.5.0.rc2' gem 'doorkeeper', '~> 5.5.0.rc2'
gem 'doorkeeper-openid_connect', '~> 1.7.5' gem 'doorkeeper-openid_connect', '~> 1.7.5'
gem 'omniauth', '~> 1.8' gem 'omniauth', '~> 1.8'
gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-auth0', '~> 2.0.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9' gem 'omniauth-azure-activedirectory-v2', '~> 0.1'
gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version
gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '~> 1.4' gem 'omniauth-github', '~> 1.4'
@ -73,6 +73,9 @@ gem 'acme-client', '~> 2.0', '>= 2.0.6'
# Browser detection # Browser detection
gem 'browser', '~> 4.2' gem 'browser', '~> 4.2'
# OS detection for usage ping
gem 'ohai', '~> 16.10'
# GPG # GPG
gem 'gpgme', '~> 2.0.19' gem 'gpgme', '~> 2.0.19'
@ -88,7 +91,7 @@ gem 'grape-entity', '~> 0.7.1'
gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
# GraphQL API # GraphQL API
gem 'graphql', '~> 1.11.4' gem 'graphql', '~> 1.11.8'
# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771 # NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771
# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released: # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
# https://gitlab.com/gitlab-org/gitlab/issues/31747 # https://gitlab.com/gitlab-org/gitlab/issues/31747
@ -112,16 +115,16 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick', '~> 4.10.1' gem 'mini_magick', '~> 4.10.1'
# for backups # for backups
gem 'fog-aws', '~> 3.8' gem 'fog-aws', '~> 3.9'
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb. # Also see config/initializers/fog_core_patch.rb.
gem 'fog-core', '= 2.1.0' gem 'fog-core', '= 2.1.0'
gem 'fog-google', '~> 1.12' gem 'gitlab-fog-google', '~> 1.13', require: 'fog/google'
gem 'fog-local', '~> 0.6' gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0' gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1' gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.3' gem 'fog-aliyun', '~> 0.3'
gem 'gitlab-fog-azure-rm', '~> 1.0', require: false gem 'gitlab-fog-azure-rm', '~> 1.0.1', require: false
# for Google storage # for Google storage
gem 'google-api-client', '~> 0.33' gem 'google-api-client', '~> 0.33'
@ -195,7 +198,7 @@ gem 'acts-as-taggable-on', '~> 7.0'
gem 'sidekiq', '~> 5.2.7' gem 'sidekiq', '~> 5.2.7'
gem 'sidekiq-cron', '~> 1.0' gem 'sidekiq-cron', '~> 1.0'
gem 'redis-namespace', '~> 1.7.0' gem 'redis-namespace', '~> 1.7.0'
gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch' gem 'gitlab-sidekiq-fetcher', '0.5.5', require: 'sidekiq-reliable-fetch'
# Cron Parser # Cron Parser
gem 'fugit', '~> 1.2.1' gem 'fugit', '~> 1.2.1'
@ -233,10 +236,7 @@ gem 'connection_pool', '~> 2.0'
gem 'redis-rails', '~> 5.0.2' gem 'redis-rails', '~> 5.0.2'
# Discord integration # Discord integration
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false gem 'discordrb-webhooks', '~> 3.4', require: false
# HipChat integration
gem 'hipchat', '~> 1.5.0'
# Jira integration # Jira integration
gem 'jira-ruby', '~> 2.1.4' gem 'jira-ruby', '~> 2.1.4'
@ -274,7 +274,10 @@ gem 'licensee', '~> 9.14.1'
gem 'charlock_holmes', '~> 0.7.7' gem 'charlock_holmes', '~> 0.7.7'
# Detect mime content type from content # Detect mime content type from content
gem 'mimemagic', '~> 0.3.2' gem 'ruby-magic-static', '~> 0.3.4'
# Fake version of the gem to trick bundler
gem 'mimemagic', '~> 0.3.10'
# Faster blank # Faster blank
gem 'fast_blank' gem 'fast_blank'
@ -309,7 +312,7 @@ gem 'pg_query', '~> 1.3.0'
gem 'premailer-rails', '~> 1.10.3' gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation # LabKit: Tracing and Correlation
gem 'gitlab-labkit', '0.14.0' gem 'gitlab-labkit', '~> 0.16.1'
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
gem 'thrift', '>= 0.14.0' gem 'thrift', '>= 0.14.0'
@ -321,7 +324,7 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext_i18n_rails_js', '~> 1.3'
gem 'gettext', '~> 3.3', require: false, group: :development gem 'gettext', '~> 3.3', require: false, group: :development
gem 'batch-loader', '~> 1.4.0' gem 'batch-loader', '~> 2.0.1'
# Perf bar # Perf bar
gem 'peek', '~> 1.1' gem 'peek', '~> 1.1'
@ -341,7 +344,6 @@ end
group :development do group :development do
gem 'brakeman', '~> 4.2', require: false gem 'brakeman', '~> 4.2', require: false
gem 'danger', '~> 8.0.6', require: false
gem 'lefthook', '~> 0.7', require: false gem 'lefthook', '~> 0.7', require: false
gem 'letter_opener_web', '~> 1.3.4' gem 'letter_opener_web', '~> 1.3.4'
@ -375,9 +377,8 @@ group :development, :test do
gem 'spring', '~> 2.1.0' gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4' gem 'spring-commands-rspec', '~> 1.0.4'
gem 'gitlab-styles', '~> 6.0.0', require: false gem 'gitlab-styles', '~> 6.1.0', require: false
gem 'scss_lint', '~> 0.59.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false gem 'haml_lint', '~> 0.36.0', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false
@ -397,6 +398,11 @@ group :development, :test do
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
end end
group :development, :test, :danger do
gem 'danger-gitlab', '~> 8.0', require: false
gem 'gitlab-dangerfiles', '~> 0.8.0', require: false
end
group :development, :test, :coverage do group :development, :test, :coverage do
gem 'simplecov', '~> 0.18.5', require: false gem 'simplecov', '~> 0.18.5', require: false
gem 'simplecov-cobertura', '~> 1.3.1', require: false gem 'simplecov-cobertura', '~> 1.3.1', require: false
@ -433,7 +439,7 @@ end
gem 'octokit', '~> 4.15' gem 'octokit', '~> 4.15'
# https://gitlab.com/gitlab-org/gitlab/issues/207207 # https://gitlab.com/gitlab-org/gitlab/issues/207207
gem 'gitlab-mail_room', '~> 0.0.8', require: 'mail_room' gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room'
gem 'email_reply_trimmer', '~> 0.1' gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text' gem 'html2text'
@ -482,7 +488,7 @@ gem 'flipper', '~> 0.17.1'
gem 'flipper-active_record', '~> 0.17.1' gem 'flipper-active_record', '~> 0.17.1'
gem 'flipper-active_support_cache_store', '~> 0.17.1' gem 'flipper-active_support_cache_store', '~> 0.17.1'
gem 'unleash', '~> 0.1.5' gem 'unleash', '~> 0.1.5'
gem 'gitlab-experiment', '~> 0.4.9' gem 'gitlab-experiment', '~> 0.5.0'
# Structured logging # Structured logging
gem 'lograge', '~> 0.5' gem 'lograge', '~> 0.5'

172
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View file

@ -88,7 +88,7 @@ GEM
asciidoctor (~> 2.0) asciidoctor (~> 2.0)
asciidoctor-plantuml (0.0.12) asciidoctor-plantuml (0.0.12)
asciidoctor (>= 1.5.6, < 3.0.0) asciidoctor (>= 1.5.6, < 3.0.0)
ast (2.4.1) ast (2.4.2)
atlassian-jwt (0.2.0) atlassian-jwt (0.2.0)
jwt (~> 2.1.0) jwt (~> 2.1.0)
attr_encrypted (3.1.0) attr_encrypted (3.1.0)
@ -127,8 +127,8 @@ GEM
nokogiri (~> 1.11.0.rc2) nokogiri (~> 1.11.0.rc2)
babosa (1.0.2) babosa (1.0.2)
base32 (0.3.2) base32 (0.3.2)
batch-loader (1.4.0) batch-loader (2.0.1)
bcrypt (3.1.12) bcrypt (3.1.16)
bcrypt_pbkdf (1.0.0) bcrypt_pbkdf (1.0.0)
benchmark-ips (2.3.0) benchmark-ips (2.3.0)
benchmark-memory (0.1.2) benchmark-memory (0.1.2)
@ -172,6 +172,14 @@ GEM
cbor (0.5.9.6) cbor (0.5.9.6)
character_set (1.4.0) character_set (1.4.0)
charlock_holmes (0.7.7) charlock_holmes (0.7.7)
chef-config (16.10.17)
addressable
chef-utils (= 16.10.17)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-utils (16.10.17)
childprocess (3.0.0) childprocess (3.0.0)
chunky_png (1.3.5) chunky_png (1.3.5)
citrus (3.0.2) citrus (3.0.2)
@ -187,7 +195,7 @@ GEM
concord (0.1.5) concord (0.1.5)
adamantium (~> 0.2.0) adamantium (~> 0.2.0)
equalizer (~> 0.0.9) equalizer (~> 0.0.9)
concurrent-ruby (1.1.7) concurrent-ruby (1.1.8)
connection_pool (2.2.2) connection_pool (2.2.2)
contracts (0.11.0) contracts (0.11.0)
cork (0.3.0) cork (0.3.0)
@ -208,7 +216,7 @@ GEM
css_parser (1.7.0) css_parser (1.7.0)
addressable addressable
daemons (1.3.1) daemons (1.3.1)
danger (8.0.6) danger (8.2.3)
claide (~> 1.0) claide (~> 1.0)
claide-plugins (>= 0.9.2) claide-plugins (>= 0.9.2)
colored2 (~> 3.1) colored2 (~> 3.1)
@ -220,7 +228,10 @@ GEM
kramdown-parser-gfm (~> 1.0) kramdown-parser-gfm (~> 1.0)
no_proxy_fix no_proxy_fix
octokit (~> 4.7) octokit (~> 4.7)
terminal-table (~> 1) terminal-table (>= 1, < 4)
danger-gitlab (8.0.0)
danger
gitlab (~> 4.2, >= 4.2.0)
database_cleaner (1.7.0) database_cleaner (1.7.0)
debugger-ruby_core_source (1.3.8) debugger-ruby_core_source (1.3.8)
deckar01-task_list (2.3.1) deckar01-task_list (2.3.1)
@ -257,8 +268,8 @@ GEM
diff-lcs (1.4.4) diff-lcs (1.4.4)
diff_match_patch (0.1.0) diff_match_patch (0.1.0)
diffy (3.3.0) diffy (3.3.0)
discordrb-webhooks-blackst0ne (3.3.0) discordrb-webhooks (3.4.2)
rest-client (~> 2.0) rest-client (>= 2.0.0)
docile (1.3.2) docile (1.3.2)
domain_name (0.5.20190701) domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
@ -348,6 +359,8 @@ GEM
ffi-compiler (1.0.1) ffi-compiler (1.0.1)
ffi (>= 1.0.0) ffi (>= 1.0.0)
rake rake
ffi-yajl (2.3.4)
libyajl2 (~> 1.2)
flipper (0.17.1) flipper (0.17.1)
flipper-active_record (0.17.1) flipper-active_record (0.17.1)
activerecord (>= 4.2, < 7) activerecord (>= 4.2, < 7)
@ -363,7 +376,7 @@ GEM
fog-json fog-json
ipaddress (~> 0.8) ipaddress (~> 0.8)
xml-simple (~> 1.1) xml-simple (~> 1.1)
fog-aws (3.8.0) fog-aws (3.9.0)
fog-core (~> 2.1) fog-core (~> 2.1)
fog-json (~> 1.1) fog-json (~> 1.1)
fog-xml (~> 0.1) fog-xml (~> 0.1)
@ -373,12 +386,6 @@ GEM
excon (~> 0.58) excon (~> 0.58)
formatador (~> 0.2) formatador (~> 0.2)
mime-types mime-types
fog-google (1.12.0)
fog-core (<= 2.1.0)
fog-json (~> 1.2)
fog-xml (~> 0.1.0)
google-api-client (>= 0.44.2, < 0.51)
google-cloud-env (~> 1.2)
fog-json (1.2.0) fog-json (1.2.0)
fog-core fog-core
multi_json (~> 1.10) multi_json (~> 1.10)
@ -403,6 +410,7 @@ GEM
fuubar (2.2.0) fuubar (2.2.0)
rspec-core (~> 3.0) rspec-core (~> 3.0)
ruby-progressbar (~> 1.4) ruby-progressbar (~> 1.4)
fuzzyurl (0.9.0)
gemoji (3.0.1) gemoji (3.0.1)
gemojione (3.3.0) gemojione (3.3.0)
json json
@ -423,38 +431,49 @@ GEM
gitaly (13.9.0.pre.rc1) gitaly (13.9.0.pre.rc1)
grpc (~> 1.0) grpc (~> 1.0)
github-markup (1.7.0) github-markup (1.7.0)
gitlab (4.16.1)
httparty (~> 0.14, >= 0.14.0)
terminal-table (~> 1.5, >= 1.5.1)
gitlab-chronic (0.10.5) gitlab-chronic (0.10.5)
numerizer (~> 0.2) numerizer (~> 0.2)
gitlab-experiment (0.4.9) gitlab-dangerfiles (0.8.0)
danger
gitlab-experiment (0.5.0)
activesupport (>= 3.0) activesupport (>= 3.0)
scientist (~> 1.5, >= 1.5.0) scientist (~> 1.5, >= 1.5.0)
gitlab-fog-azure-rm (1.0.0) gitlab-fog-azure-rm (1.0.1)
azure-storage-blob (~> 2.0) azure-storage-blob (~> 2.0)
azure-storage-common (~> 2.0) azure-storage-common (~> 2.0)
fog-core (= 2.1.0) fog-core (= 2.1.0)
fog-json (~> 1.2.0) fog-json (~> 1.2.0)
mime-types mime-types
ms_rest_azure (~> 0.12.0) ms_rest_azure (~> 0.12.0)
gitlab-labkit (0.14.0) gitlab-fog-google (1.13.0)
addressable (>= 2.7.0)
fog-core (<= 2.1.0)
fog-json (~> 1.2)
fog-xml (~> 0.1.0)
google-api-client (>= 0.44.2, < 0.51)
google-cloud-env (~> 1.2)
gitlab-labkit (0.16.1)
actionpack (>= 5.0.0, < 7.0.0) actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0)
gitlab-pg_query (~> 1.3)
grpc (~> 1.19) grpc (~> 1.19)
jaeger-client (~> 1.1) jaeger-client (~> 1.1)
opentracing (~> 0.4) opentracing (~> 0.4)
pg_query (~> 1.3)
redis (> 3.0.0, < 5.0.0) redis (> 3.0.0, < 5.0.0)
gitlab-license (1.3.0) gitlab-license (1.3.1)
gitlab-mail_room (0.0.8) gitlab-mail_room (0.0.9)
gitlab-markup (1.7.1) gitlab-markup (1.7.1)
gitlab-net-dns (0.9.1) gitlab-net-dns (0.9.1)
gitlab-pg_query (1.3.1)
gitlab-pry-byebug (3.9.0) gitlab-pry-byebug (3.9.0)
byebug (~> 11.0) byebug (~> 11.0)
pry (~> 0.13.0) pry (~> 0.13.0)
gitlab-sidekiq-fetcher (0.5.2) gitlab-sidekiq-fetcher (0.5.5)
sidekiq (~> 5) sidekiq (~> 5)
gitlab-styles (6.0.0) gitlab-styles (6.1.0)
rubocop (~> 0.91.1) rubocop (~> 0.91, >= 0.91.1)
rubocop-gitlab-security (~> 0.1.1) rubocop-gitlab-security (~> 0.1.1)
rubocop-performance (~> 1.9.2) rubocop-performance (~> 1.9.2)
rubocop-rails (~> 2.9) rubocop-rails (~> 2.9)
@ -520,7 +539,7 @@ GEM
faraday (>= 1.0) faraday (>= 1.0)
faraday_middleware faraday_middleware
graphql-client graphql-client
graphql (1.11.4) graphql (1.11.8)
graphql-client (0.16.0) graphql-client (0.16.0)
activesupport (>= 3.0) activesupport (>= 3.0)
graphql (~> 1.8) graphql (~> 1.8)
@ -574,9 +593,6 @@ GEM
railties (>= 5.0) railties (>= 5.0)
heapy (0.2.0) heapy (0.2.0)
thor thor
hipchat (1.5.2)
httparty
mimemagic
html-pipeline (2.13.2) html-pipeline (2.13.2)
activesupport (>= 2) activesupport (>= 2)
nokogiri (>= 1.4) nokogiri (>= 1.4)
@ -598,7 +614,7 @@ GEM
mime-types (~> 3.0) mime-types (~> 3.0)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.8.7) i18n (1.8.9)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
i18n_data (0.8.0) i18n_data (0.8.0)
icalendar (2.4.1) icalendar (2.4.1)
@ -668,6 +684,7 @@ GEM
actionmailer (>= 3.2) actionmailer (>= 3.2)
letter_opener (~> 1.0) letter_opener (~> 1.0)
railties (>= 3.2) railties (>= 3.2)
libyajl2 (1.2.0)
license_finder (6.0.0) license_finder (6.0.0)
bundler bundler
rubyzip (>= 1, < 3) rubyzip (>= 1, < 3)
@ -711,12 +728,20 @@ GEM
mime-types (3.3.1) mime-types (3.3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2020.0512) mime-types-data (3.2020.0512)
mimemagic (0.3.5) mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_histogram (0.3.1) mini_histogram (0.3.1)
mini_magick (4.10.1) mini_magick (4.10.1)
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.5.0) mini_portile2 (2.5.0)
minitest (5.11.3) minitest (5.11.3)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
tomlrb
mixlib-log (3.0.9)
mixlib-shellout (3.2.5)
chef-utils
ms_rest (0.7.6) ms_rest (0.7.6)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
faraday (>= 0.9, < 2.0.0) faraday (>= 0.9, < 2.0.0)
@ -737,10 +762,12 @@ GEM
mustermann (>= 1.0.0) mustermann (>= 1.0.0)
nap (1.1.0) nap (1.1.0)
nenv (0.3.0) nenv (0.3.0)
net-http-persistent (4.0.0) net-http-persistent (4.0.1)
connection_pool (~> 2.2) connection_pool (~> 2.2)
net-ldap (0.16.3) net-ldap (0.16.3)
net-ntp (2.1.3) net-ntp (2.1.3)
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.0.0) net-ssh (6.0.0)
netrc (0.11.0) netrc (0.11.0)
nio4r (2.5.4) nio4r (2.5.4)
@ -764,6 +791,19 @@ GEM
octokit (4.20.0) octokit (4.20.0)
faraday (>= 0.9) faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3) sawyer (~> 0.8.0, >= 0.5.3)
ohai (16.10.6)
chef-config (>= 12.8, < 17)
chef-utils (>= 16.0, < 17)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
ipaddress
mixlib-cli (>= 1.7.0)
mixlib-config (>= 2.0, < 4.0)
mixlib-log (>= 2.0.1, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
plist (~> 3.1)
train-core
wmi-lite (~> 1.0)
oj (3.10.6) oj (3.10.6)
omniauth (1.9.0) omniauth (1.9.0)
hashie (>= 3.4.6, < 3.7.0) hashie (>= 3.4.6, < 3.7.0)
@ -776,6 +816,8 @@ GEM
omniauth-authentiq (0.3.3) omniauth-authentiq (0.3.3)
jwt (>= 1.5) jwt (>= 1.5)
omniauth-oauth2 (>= 1.5) omniauth-oauth2 (>= 1.5)
omniauth-azure-activedirectory-v2 (0.1.1)
omniauth-oauth2
omniauth-azure-oauth2 (0.0.10) omniauth-azure-oauth2 (0.0.10)
jwt (>= 1.0, < 3.0) jwt (>= 1.0, < 3.0)
omniauth (~> 1.0) omniauth (~> 1.0)
@ -855,6 +897,7 @@ GEM
railties (>= 4.0.0) railties (>= 4.0.0)
pg (1.2.3) pg (1.2.3)
pg_query (1.3.0) pg_query (1.3.0)
plist (3.6.0)
png_quantizator (0.2.1) png_quantizator (0.2.1)
po_to_json (1.0.1) po_to_json (1.0.1)
json (>= 1.6.0) json (>= 1.6.0)
@ -1041,16 +1084,16 @@ GEM
pg pg
rails rails
sqlite3 sqlite3
rubocop (0.91.1) rubocop (0.93.1)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.7.1.1) parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7) regexp_parser (>= 1.8)
rexml rexml
rubocop-ast (>= 0.4.0, < 1.0) rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0) unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.8.0) rubocop-ast (1.4.1)
parser (>= 2.7.1.5) parser (>= 2.7.1.5)
rubocop-gitlab-security (0.1.1) rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51) rubocop (>= 0.51)
@ -1068,6 +1111,8 @@ GEM
i18n i18n
ruby-fogbugz (0.2.1) ruby-fogbugz (0.2.1)
crack (~> 0.4) crack (~> 0.4)
ruby-magic-static (0.3.5)
mini_portile2 (~> 2.5.0)
ruby-prof (1.3.1) ruby-prof (1.3.1)
ruby-progressbar (1.11.0) ruby-progressbar (1.11.0)
ruby-saml (1.7.2) ruby-saml (1.7.2)
@ -1079,7 +1124,7 @@ GEM
rubyntlm (0.6.2) rubyntlm (0.6.2)
rubypants (0.2.0) rubypants (0.2.0)
rubyzip (2.0.0) rubyzip (2.0.0)
rugged (1.0.1) rugged (1.1.0)
safe_yaml (1.0.4) safe_yaml (1.0.4)
safety_net_attestation (0.4.0) safety_net_attestation (0.4.0)
jwt (~> 2.0) jwt (~> 2.0)
@ -1104,9 +1149,7 @@ GEM
sawyer (0.8.2) sawyer (0.8.2)
addressable (>= 2.3.5) addressable (>= 2.3.5)
faraday (> 0.8, < 2.0) faraday (> 0.8, < 2.0)
scientist (1.5.0) scientist (1.6.0)
scss_lint (0.59.0)
sass (~> 3.5, >= 3.5.5)
securecompare (1.0.0) securecompare (1.0.0)
seed-fu (2.3.7) seed-fu (2.3.7)
activerecord (>= 3.1) activerecord (>= 3.1)
@ -1196,9 +1239,17 @@ GEM
parslet (~> 1.8.0) parslet (~> 1.8.0)
toml-rb (1.0.0) toml-rb (1.0.0)
citrus (~> 3.0, > 3.0) citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
tpm-key_attestation (0.9.0) tpm-key_attestation (0.9.0)
bindata (~> 2.4) bindata (~> 2.4)
openssl-signature_algorithm (~> 0.4.0) openssl-signature_algorithm (~> 0.4.0)
train-core (3.4.9)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 4.0)
net-ssh (>= 2.9, < 7.0)
truncato (0.7.11) truncato (0.7.11)
htmlentities (~> 4.3.1) htmlentities (~> 4.3.1)
nokogiri (>= 1.7.0, <= 2.0) nokogiri (>= 1.7.0, <= 2.0)
@ -1235,7 +1286,7 @@ GEM
validate_email (0.1.6) validate_email (0.1.6)
activemodel (>= 3.0) activemodel (>= 3.0)
mail (>= 2.2.5) mail (>= 2.2.5)
validate_url (1.0.8) validate_url (1.0.13)
activemodel (>= 3.0.0) activemodel (>= 3.0.0)
public_suffix public_suffix
validates_hostname (1.0.11) validates_hostname (1.0.11)
@ -1271,6 +1322,7 @@ GEM
expression_parser expression_parser
rinku rinku
with_env (1.1.0) with_env (1.1.0)
wmi-lite (1.0.5)
xml-simple (1.1.5) xml-simple (1.1.5)
xpath (3.2.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
@ -1302,8 +1354,8 @@ DEPENDENCIES
aws-sdk-s3 (~> 1) aws-sdk-s3 (~> 1)
babosa (~> 1.0.2) babosa (~> 1.0.2)
base32 (~> 0.3.0) base32 (~> 0.3.0)
batch-loader (~> 1.4.0) batch-loader (~> 2.0.1)
bcrypt (= 3.1.12) bcrypt (~> 3.1, >= 3.1.14)
bcrypt_pbkdf (~> 1.0) bcrypt_pbkdf (~> 1.0)
benchmark-ips (~> 2.3.0) benchmark-ips (~> 2.3.0)
benchmark-memory (~> 0.1) benchmark-memory (~> 0.1)
@ -1324,7 +1376,7 @@ DEPENDENCIES
countries (~> 3.0) countries (~> 3.0)
creole (~> 0.5.0) creole (~> 0.5.0)
crystalball (~> 0.7.0) crystalball (~> 0.7.0)
danger (~> 8.0.6) danger-gitlab (~> 8.0)
database_cleaner (~> 1.7.0) database_cleaner (~> 1.7.0)
deckar01-task_list (= 2.3.1) deckar01-task_list (= 2.3.1)
default_value_for (~> 3.4.0) default_value_for (~> 3.4.0)
@ -1335,7 +1387,7 @@ DEPENDENCIES
devise-two-factor (~> 3.1.0) devise-two-factor (~> 3.1.0)
diff_match_patch (~> 0.1.0) diff_match_patch (~> 0.1.0)
diffy (~> 3.3) diffy (~> 3.3)
discordrb-webhooks-blackst0ne (~> 3.3) discordrb-webhooks (~> 3.4)
doorkeeper (~> 5.5.0.rc2) doorkeeper (~> 5.5.0.rc2)
doorkeeper-openid_connect (~> 1.7.5) doorkeeper-openid_connect (~> 1.7.5)
ed25519 (~> 1.2) ed25519 (~> 1.2)
@ -1356,9 +1408,8 @@ DEPENDENCIES
flipper-active_support_cache_store (~> 0.17.1) flipper-active_support_cache_store (~> 0.17.1)
flowdock (~> 0.7) flowdock (~> 0.7)
fog-aliyun (~> 0.3) fog-aliyun (~> 0.3)
fog-aws (~> 3.8) fog-aws (~> 3.9)
fog-core (= 2.1.0) fog-core (= 2.1.0)
fog-google (~> 1.12)
fog-local (~> 0.6) fog-local (~> 0.6)
fog-openstack (~> 1.0) fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1) fog-rackspace (~> 0.1.1)
@ -1371,16 +1422,18 @@ DEPENDENCIES
gitaly (~> 13.9.0.pre.rc1) gitaly (~> 13.9.0.pre.rc1)
github-markup (~> 1.7.0) github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5) gitlab-chronic (~> 0.10.5)
gitlab-experiment (~> 0.4.9) gitlab-dangerfiles (~> 0.8.0)
gitlab-fog-azure-rm (~> 1.0) gitlab-experiment (~> 0.5.0)
gitlab-labkit (= 0.14.0) gitlab-fog-azure-rm (~> 1.0.1)
gitlab-fog-google (~> 1.13)
gitlab-labkit (~> 0.16.1)
gitlab-license (~> 1.3) gitlab-license (~> 1.3)
gitlab-mail_room (~> 0.0.8) gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.7.1) gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1) gitlab-net-dns (~> 0.9.1)
gitlab-pry-byebug gitlab-pry-byebug
gitlab-sidekiq-fetcher (= 0.5.2) gitlab-sidekiq-fetcher (= 0.5.5)
gitlab-styles (~> 6.0.0) gitlab-styles (~> 6.1.0)
gitlab_chronic_duration (~> 0.10.6.2) gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1) gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2) gon (~> 6.2)
@ -1393,7 +1446,7 @@ DEPENDENCIES
grape_logging (~> 1.7) grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10) graphiql-rails (~> 1.4.10)
graphlient (~> 0.4.0) graphlient (~> 0.4.0)
graphql (~> 1.11.4) graphql (~> 1.11.8)
graphql-docs (~> 1.6.0) graphql-docs (~> 1.6.0)
grpc (~> 1.30.2) grpc (~> 1.30.2)
gssapi gssapi
@ -1404,7 +1457,6 @@ DEPENDENCIES
hashie hashie
hashie-forbidden_attributes hashie-forbidden_attributes
health_check (~> 3.0) health_check (~> 3.0)
hipchat (~> 1.5.0)
html-pipeline (~> 2.13.2) html-pipeline (~> 2.13.2)
html2text html2text
httparty (~> 0.16.4) httparty (~> 0.16.4)
@ -1433,7 +1485,7 @@ DEPENDENCIES
marginalia (~> 1.10.0) marginalia (~> 1.10.0)
memory_profiler (~> 0.9) memory_profiler (~> 0.9)
method_source (~> 1.0) method_source (~> 1.0)
mimemagic (~> 0.3.2) mimemagic (~> 0.3.10)
mini_magick (~> 4.10.1) mini_magick (~> 4.10.1)
minitest (~> 5.11.0) minitest (~> 5.11.0)
multi_json (~> 1.14.1) multi_json (~> 1.14.1)
@ -1443,11 +1495,13 @@ DEPENDENCIES
nokogiri (~> 1.11.1) nokogiri (~> 1.11.1)
oauth2 (~> 1.4) oauth2 (~> 1.4)
octokit (~> 4.15) octokit (~> 4.15)
ohai (~> 16.10)
oj (~> 3.10.6) oj (~> 3.10.6)
omniauth (~> 1.8) omniauth (~> 1.8)
omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-atlassian-oauth2 (~> 0.2.0)
omniauth-auth0 (~> 2.0.0) omniauth-auth0 (~> 2.0.0)
omniauth-authentiq (~> 0.3.3) omniauth-authentiq (~> 0.3.3)
omniauth-azure-activedirectory-v2 (~> 0.1)
omniauth-azure-oauth2 (~> 0.0.9) omniauth-azure-oauth2 (~> 0.0.9)
omniauth-cas3 (~> 1.1.4) omniauth-cas3 (~> 1.1.4)
omniauth-facebook (~> 4.0.0) omniauth-facebook (~> 4.0.0)
@ -1505,14 +1559,14 @@ DEPENDENCIES
rspec_junit_formatter rspec_junit_formatter
rspec_profiling (~> 0.0.6) rspec_profiling (~> 0.0.6)
ruby-fogbugz (~> 0.2.1) ruby-fogbugz (~> 0.2.1)
ruby-magic-static (~> 0.3.4)
ruby-prof (~> 1.3.0) ruby-prof (~> 1.3.0)
ruby-progressbar (~> 1.10) ruby-progressbar (~> 1.10)
ruby_parser (~> 3.15) ruby_parser (~> 3.15)
rubyzip (~> 2.0.0) rubyzip (~> 2.0.0)
rugged (~> 1.0.1) rugged (~> 1.1)
sanitize (~> 5.2.1) sanitize (~> 5.2.1)
sassc-rails (~> 2.1.0) sassc-rails (~> 2.1.0)
scss_lint (~> 0.59.0)
seed-fu (~> 2.3.7) seed-fu (~> 2.3.7)
selenium-webdriver (~> 3.142) selenium-webdriver (~> 3.142)
sentry-raven (~> 3.0) sentry-raven (~> 3.0)

369
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View file

@ -285,10 +285,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
type = "gem"; type = "gem";
}; };
version = "2.4.1"; version = "2.4.2";
}; };
atlassian-jwt = { atlassian-jwt = {
dependencies = ["jwt"]; dependencies = ["jwt"];
@ -475,20 +475,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "09jaxxddqpgq8ynwd2gpjq5rkhw00zdjnqisk9qbpjgxzk6f8gwi"; sha256 = "17d8wwj880zar5h8zxdmw878shgmljmmv957802fw5nkg3gi3xwk";
type = "gem"; type = "gem";
}; };
version = "1.4.0"; version = "2.0.1";
}; };
bcrypt = { bcrypt = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy"; sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb";
type = "gem"; type = "gem";
}; };
version = "3.1.12"; version = "3.1.16";
}; };
bcrypt_pbkdf = { bcrypt_pbkdf = {
groups = ["ed25519"]; groups = ["ed25519"];
@ -703,6 +703,27 @@
}; };
version = "0.7.7"; version = "0.7.7";
}; };
chef-config = {
dependencies = ["addressable" "chef-utils" "fuzzyurl" "mixlib-config" "mixlib-shellout" "tomlrb"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z3lashvhqy9v5b3xn8vzzf07gnjw4mgdiiryxsg6kdasvj62j8z";
type = "gem";
};
version = "16.10.17";
};
chef-utils = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cypir7fza7jfqaj1j1jh37d3i6bvrmm6jamjlngk3xbdbd56hm7";
type = "gem";
};
version = "16.10.17";
};
childprocess = { childprocess = {
groups = ["default" "test"]; groups = ["default" "test"];
platforms = []; platforms = [];
@ -805,10 +826,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
type = "gem"; type = "gem";
}; };
version = "1.1.7"; version = "1.1.8";
}; };
connection_pool = { connection_pool = {
groups = ["default"]; groups = ["default"];
@ -928,14 +949,25 @@
}; };
danger = { danger = {
dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"]; dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"];
groups = ["development"]; groups = ["danger" "default" "development" "test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0lrifb0kbjk9033pzjnp8qqqkg2z212h8dgj71k15c6wb6rycqa7"; sha256 = "1nv02gq90nngnfa6hgiyyk60a31xfayk67va98k41gy9arhdkz5g";
type = "gem"; type = "gem";
}; };
version = "8.0.6"; version = "8.2.3";
};
danger-gitlab = {
dependencies = ["danger" "gitlab"];
groups = ["danger" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a530kx5s5rbx5yx3jqay56lkksqh0yj468hcpg16faiyv8dfza9";
type = "gem";
};
version = "8.0.0";
}; };
database_cleaner = { database_cleaner = {
groups = ["development" "test"]; groups = ["development" "test"];
@ -1087,16 +1119,16 @@
}; };
version = "3.3.0"; version = "3.3.0";
}; };
discordrb-webhooks-blackst0ne = { discordrb-webhooks = {
dependencies = ["rest-client"]; dependencies = ["rest-client"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1f0dw6ci5cbrxrvvqw2kqabpzyjisd4hflbi370rpb4cakkzgw39"; sha256 = "0viw73jd9vs9f92a9q2vxcd29755h7w8jwz36jmvcdl2najainyg";
type = "gem"; type = "gem";
}; };
version = "3.3.0"; version = "3.4.2";
}; };
docile = { docile = {
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
@ -1563,6 +1595,17 @@
}; };
version = "1.0.1"; version = "1.0.1";
}; };
ffi-yajl = {
dependencies = ["libyajl2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pfmn0gprc3c15baxa9rx64pqllk64m60f5vg4gp0icpafkp0jx5";
type = "gem";
};
version = "2.3.4";
};
flipper = { flipper = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -1623,10 +1666,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1q7n8r03akjbdz3r2bgsl6wcjvdlf0k508z8bsd9zgs43qg14vc9"; sha256 = "10y32rm3vcfh82p2fdr2zq8ibknx1jslmai5m0r261bdr3brkssm";
type = "gem"; type = "gem";
}; };
version = "3.8.0"; version = "3.9.0";
}; };
fog-core = { fog-core = {
dependencies = ["builder" "excon" "formatador" "mime-types"]; dependencies = ["builder" "excon" "formatador" "mime-types"];
@ -1639,17 +1682,6 @@
}; };
version = "2.1.0"; version = "2.1.0";
}; };
fog-google = {
dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cl6rprichdn1i40c2ndri1c53cfb0x2xk58l9arwip9ivkasln4";
type = "gem";
};
version = "1.12.0";
};
fog-json = { fog-json = {
dependencies = ["fog-core" "multi_json"]; dependencies = ["fog-core" "multi_json"];
groups = ["default"]; groups = ["default"];
@ -1737,6 +1769,16 @@
}; };
version = "2.2.0"; version = "2.2.0";
}; };
fuzzyurl = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03qchs33vfwbsv5awxg3acfmlcrf5xbhnbrc83fdpamwya0glbjl";
type = "gem";
};
version = "0.9.0";
};
gemoji = { gemoji = {
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
platforms = []; platforms = [];
@ -1834,6 +1876,17 @@
}; };
version = "1.7.0"; version = "1.7.0";
}; };
gitlab = {
dependencies = ["httparty" "terminal-table"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kq77304vn733xc8iipq4wpdk5qb0zwjryhm3fia3mfsrdcp1z8k";
type = "gem";
};
version = "4.16.1";
};
gitlab-chronic = { gitlab-chronic = {
dependencies = ["numerizer"]; dependencies = ["numerizer"];
groups = ["default"]; groups = ["default"];
@ -1845,16 +1898,27 @@
}; };
version = "0.10.5"; version = "0.10.5";
}; };
gitlab-dangerfiles = {
dependencies = ["danger"];
groups = ["danger" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09ggs890b5gfphnz7ayavs55l6xhw323spfd22dg246g0rw9vliy";
type = "gem";
};
version = "0.8.0";
};
gitlab-experiment = { gitlab-experiment = {
dependencies = ["activesupport" "scientist"]; dependencies = ["activesupport" "scientist"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0skqg90i6qdpm7dhy8bv99gk8siwgm6mpr675790ngri1ns4f5xk"; sha256 = "0x4hyva7ypi2mx5jcyxac8w7ffai1pkkjc49fk3avqh4aimlibfr";
type = "gem"; type = "gem";
}; };
version = "0.4.9"; version = "0.5.0";
}; };
gitlab-fog-azure-rm = { gitlab-fog-azure-rm = {
dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"];
@ -1862,41 +1926,52 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "04l7ps0vvrqq8i25q7ic2zy2n8f8f1l7sn1shf5wccy1cbyj9pig"; sha256 = "05yc5fp45v7y6h838zrj4666ar1ddhn8i5bbdxm8j73yrn2kjnal";
type = "gem"; type = "gem";
}; };
version = "1.0.0"; version = "1.0.1";
}; };
gitlab-labkit = { gitlab-fog-google = {
dependencies = ["actionpack" "activesupport" "gitlab-pg_query" "grpc" "jaeger-client" "opentracing" "redis"]; dependencies = ["addressable" "fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0l4sbvlk6qc0x8372rp1gc2ihmx3vp0afrm5cy55xhflq16y7sl1"; sha256 = "0ybmiclsdpkp1l91z6d4qkhha6cik6kgf4kzs3a2c26mhnnj6gxy";
type = "gem"; type = "gem";
}; };
version = "0.14.0"; version = "1.13.0";
};
gitlab-labkit = {
dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03i8fc1yzm5yzqxb8bxhjkhqpj17fy71vg2z02bcj4mzbj0piflx";
type = "gem";
};
version = "0.16.1";
}; };
gitlab-license = { gitlab-license = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "04846kr8pw0fkw4mavakai978raq5d2kjna4rawxpc3dqlr897g4"; sha256 = "01z5pb6fg1j83p73vys2fhj7qh60zkqbgiyp4nvw013a6hjlv3qk";
type = "gem"; type = "gem";
}; };
version = "1.3.0"; version = "1.3.1";
}; };
gitlab-mail_room = { gitlab-mail_room = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "05j8rpsbl2l5q4xnfh2cnws9axy1a19asg8nlw6jngba94raw5ir"; sha256 = "0745kls2bazgk6kbmlq1dmd42z8bgxkyn6ki9snxka8abi5kf037";
type = "gem"; type = "gem";
}; };
version = "0.0.8"; version = "0.0.9";
}; };
gitlab-markup = { gitlab-markup = {
groups = ["default"]; groups = ["default"];
@ -1918,16 +1993,6 @@
}; };
version = "0.9.1"; version = "0.9.1";
}; };
gitlab-pg_query = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rybirjyclavp641qdx27483xx0zpmc577wdzfgdnjd7753bya7g";
type = "gem";
};
version = "1.3.1";
};
gitlab-pry-byebug = { gitlab-pry-byebug = {
dependencies = ["byebug" "pry"]; dependencies = ["byebug" "pry"];
groups = ["development" "test"]; groups = ["development" "test"];
@ -1949,10 +2014,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0dvx2klf1a1xyf15q34fn59291v6jwx3z315rxb2dmkvcr9873m1"; sha256 = "055v0cxvxgy12iwhqa2xbsxa9j6ww7p1f5jqwncwsnr7l6f1f4c9";
type = "gem"; type = "gem";
}; };
version = "0.5.2"; version = "0.5.5";
}; };
gitlab-styles = { gitlab-styles = {
dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rails" "rubocop-rspec"];
@ -1960,10 +2025,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "17d238cy031gnjmrk6wl3qyk5kqhqjxrb68813n4y9ia817xmwyp"; sha256 = "0y3livdpkdzp4cy47ycpwqa7nhrf6fb1ff2lwhh4l5n4dpqympwn";
type = "gem"; type = "gem";
}; };
version = "6.0.0"; version = "6.1.0";
}; };
gitlab_chronic_duration = { gitlab_chronic_duration = {
dependencies = ["numerizer"]; dependencies = ["numerizer"];
@ -2145,10 +2210,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "01ldxhn59lfg5ivxc9m11v1qhw29ql95qcvwwcap49n0z7d1i3k5"; sha256 = "0rm59b6klp97287h01aj8hr12mhsya585as2z1sk8hq2lp51imfn";
type = "gem"; type = "gem";
}; };
version = "1.11.4"; version = "1.11.8";
}; };
graphql-client = { graphql-client = {
dependencies = ["activesupport" "graphql"]; dependencies = ["activesupport" "graphql"];
@ -2332,17 +2397,6 @@
}; };
version = "0.2.0"; version = "0.2.0";
}; };
hipchat = {
dependencies = ["httparty" "mimemagic"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
type = "gem";
};
version = "1.5.2";
};
html-pipeline = { html-pipeline = {
dependencies = ["activesupport" "nokogiri"]; dependencies = ["activesupport" "nokogiri"];
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
@ -2455,10 +2509,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv"; sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
type = "gem"; type = "gem";
}; };
version = "1.8.7"; version = "1.8.9";
}; };
i18n_data = { i18n_data = {
groups = ["default"]; groups = ["default"];
@ -2758,6 +2812,16 @@
}; };
version = "1.3.4"; version = "1.3.4";
}; };
libyajl2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n5j0p8dxf9xzb9n4bkdr8w0a8gg3jzrn9indri3n0fv90gcs5qi";
type = "gem";
};
version = "1.2.0";
};
license_finder = { license_finder = {
dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"]; dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"];
groups = ["development" "omnibus" "test"]; groups = ["development" "omnibus" "test"];
@ -2953,14 +3017,15 @@
version = "3.2020.0512"; version = "3.2020.0512";
}; };
mimemagic = { mimemagic = {
dependencies = ["nokogiri" "rake"];
groups = ["default" "test"]; groups = ["default" "test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1qfqb9w76kmpb48frbzbyvjc0dfxh5qiw1kxdbv2y2kp6fxpa1kf"; sha256 = "0cqm9n9122qpksn9v6mp0gn3lrzxhh72lwl7yb6j75gykdan6h41";
type = "gem"; type = "gem";
}; };
version = "0.3.5"; version = "0.3.10";
}; };
mini_histogram = { mini_histogram = {
groups = ["default" "test"]; groups = ["default" "test"];
@ -3012,6 +3077,48 @@
}; };
version = "5.11.3"; version = "5.11.3";
}; };
mixlib-cli = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6";
type = "gem";
};
version = "2.1.8";
};
mixlib-config = {
dependencies = ["tomlrb"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq";
type = "gem";
};
version = "3.0.9";
};
mixlib-log = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n5dm5iz90ijvjn59jfm8gb8hgsvbj0f1kpzbl38b02z0z4a4v7x";
type = "gem";
};
version = "3.0.9";
};
mixlib-shellout = {
dependencies = ["chef-utils"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g99c3s5zvrwvlv3gjw5fvpdimybpfazqyszjim5kdjjbq0586hj";
type = "gem";
};
version = "3.2.5";
};
ms_rest = { ms_rest = {
dependencies = ["concurrent-ruby" "faraday" "timeliness"]; dependencies = ["concurrent-ruby" "faraday" "timeliness"];
groups = ["default"]; groups = ["default"];
@ -3132,10 +3239,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0sbdvkn7mzl883iykz74hgp14qj041gldf2vdk9g3gyqc843l2vr"; sha256 = "1yfypmfg1maf20yfd22zzng8k955iylz7iip0mgc9lazw36g8li7";
type = "gem"; type = "gem";
}; };
version = "4.0.0"; version = "4.0.1";
}; };
net-ldap = { net-ldap = {
groups = ["default"]; groups = ["default"];
@ -3157,6 +3264,17 @@
}; };
version = "2.1.3"; version = "2.1.3";
}; };
net-scp = {
dependencies = ["net-ssh"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b4h3ip8d1gkrc0znnw54hbxillk73mdnaf5pz330lmrcl1wiilg";
type = "gem";
};
version = "3.0.0";
};
net-ssh = { net-ssh = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -3272,6 +3390,17 @@
}; };
version = "4.20.0"; version = "4.20.0";
}; };
ohai = {
dependencies = ["chef-config" "chef-utils" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "train-core" "wmi-lite"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08pc5l9p741g08x7xzbkkyi2kz5m5xr8rdj6hfna9bjzb1p80ddq";
type = "gem";
};
version = "16.10.6";
};
oj = { oj = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -3326,6 +3455,17 @@
}; };
version = "0.3.3"; version = "0.3.3";
}; };
omniauth-azure-activedirectory-v2 = {
dependencies = ["omniauth-oauth2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bgdyzjh7x9knkzaa6bl9f5fvh05nd0gqxrqassww0vqh5qgyfpy";
type = "gem";
};
version = "0.1.1";
};
omniauth-azure-oauth2 = { omniauth-azure-oauth2 = {
dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
groups = ["default"]; groups = ["default"];
@ -3667,6 +3807,16 @@
}; };
version = "1.3.0"; version = "1.3.0";
}; };
plist = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l";
type = "gem";
};
version = "3.6.0";
};
png_quantizator = { png_quantizator = {
groups = ["development" "test"]; groups = ["development" "test"];
platforms = []; platforms = [];
@ -4479,10 +4629,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "19nmdwz6mc5ah0xqlj1j58ylcp9zsckb1xm7p1z51abnqhcq5c06"; sha256 = "0phrig25dykgi42z6mf1abllh3ws6sv7awa82hzvvvbjx2xlzd3k";
type = "gem"; type = "gem";
}; };
version = "0.91.1"; version = "0.93.1";
}; };
rubocop-ast = { rubocop-ast = {
dependencies = ["parser"]; dependencies = ["parser"];
@ -4490,10 +4640,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "165ws2vwnw33nlqgzvzzjjp1zhkc712a92lbpbjx8j83g44dmdy4"; sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78";
type = "gem"; type = "gem";
}; };
version = "0.8.0"; version = "1.4.1";
}; };
rubocop-gitlab-security = { rubocop-gitlab-security = {
dependencies = ["rubocop"]; dependencies = ["rubocop"];
@ -4561,6 +4711,17 @@
}; };
version = "0.2.1"; version = "0.2.1";
}; };
ruby-magic-static = {
dependencies = ["mini_portile2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0whs2i868g1bgglrxl6aba47h8n9zqglsipskk6l83rfkm85ik3g";
type = "gem";
};
version = "0.3.5";
};
ruby-prof = { ruby-prof = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -4658,10 +4819,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "056bwiwxvnbkbgsr2wqcsknnc73nqasqdnjcpgj2r61wkm8mzmbn"; sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy";
type = "gem"; type = "gem";
}; };
version = "1.0.1"; version = "1.1.0";
}; };
safe_yaml = { safe_yaml = {
groups = ["default" "test"]; groups = ["default" "test"];
@ -4755,21 +4916,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "09565ppvd851zxpspn5d5q28wqkfjyfxhvda9w80i16p3y937155"; sha256 = "0jklwk9aldvlmdv17m77g2f82j383alqd4jjnwn4c564q9wvz3fp";
type = "gem"; type = "gem";
}; };
version = "1.5.0"; version = "1.6.0";
};
scss_lint = {
dependencies = ["sass"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1s6dzk4n9pnmqciliggwpiny43vc3cx3n2d5gqa9aqng77ff7yv7";
type = "gem";
};
version = "0.59.0";
}; };
securecompare = { securecompare = {
groups = ["default"]; groups = ["default"];
@ -5273,6 +5423,16 @@
}; };
version = "1.0.0"; version = "1.0.0";
}; };
tomlrb = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00x5y9h4fbvrv4xrjk4cqlkm4vq8gv73ax4alj3ac2x77zsnnrk8";
type = "gem";
};
version = "1.3.0";
};
tpm-key_attestation = { tpm-key_attestation = {
dependencies = ["bindata" "openssl-signature_algorithm"]; dependencies = ["bindata" "openssl-signature_algorithm"];
groups = ["default"]; groups = ["default"];
@ -5284,6 +5444,17 @@
}; };
version = "0.9.0"; version = "0.9.0";
}; };
train-core = {
dependencies = ["addressable" "ffi" "json" "mixlib-shellout" "net-scp" "net-ssh"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pbfbmi9l5hxr1zly1bc72fk8a6by4d19wdap8q3mi3rlflqzbfp";
type = "gem";
};
version = "3.4.9";
};
truncato = { truncato = {
dependencies = ["htmlentities" "nokogiri"]; dependencies = ["htmlentities" "nokogiri"];
groups = ["default"]; groups = ["default"];
@ -5459,10 +5630,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1k0bfxzvdcf1nrqhvnyhijc4mwab9wn4qvqb0ynq6p8dj0f866zi"; sha256 = "1bwj34rz7961rrl545f006m2jdz1nrc0m72gfqmnb41xwsvpagbk";
type = "gem"; type = "gem";
}; };
version = "1.0.8"; version = "1.0.13";
}; };
validates_hostname = { validates_hostname = {
dependencies = ["activerecord" "activesupport"]; dependencies = ["activerecord" "activesupport"];
@ -5591,6 +5762,16 @@
}; };
version = "1.1.0"; version = "1.1.0";
}; };
wmi-lite = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "110dv4arvwyky6f2pq19f20f1xcjpiz3zfbals0y49ijpq8agvql";
type = "gem";
};
version = "1.0.5";
};
xml-simple = { xml-simple = {
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
platforms = []; platforms = [];
@ -5632,4 +5813,4 @@
}; };
version = "2.4.2"; version = "2.4.2";
}; };
} }

9
pkgs/applications/version-management/gitlab/update.py
View file

@ -68,7 +68,7 @@ class GitLabRepo:
version = self.rev2version(rev) version = self.rev2version(rev)
passthru = {v: self.get_file(v, rev).strip() for v in ['GITALY_SERVER_VERSION', 'GITLAB_PAGES_VERSION', passthru = {v: self.get_file(v, rev).strip() for v in ['GITALY_SERVER_VERSION', 'GITLAB_PAGES_VERSION',
'GITLAB_SHELL_VERSION', 'GITLAB_WORKHORSE_VERSION']} 'GITLAB_SHELL_VERSION']}
return dict(version=self.rev2version(rev), return dict(version=self.rev2version(rev),
repo_hash=self.get_git_hash(rev), repo_hash=self.get_git_hash(rev),
owner=self.owner, owner=self.owner,
@ -181,19 +181,14 @@ def update_gitlab_shell():
gitlab_shell_version = data['passthru']['GITLAB_SHELL_VERSION'] gitlab_shell_version = data['passthru']['GITLAB_SHELL_VERSION']
_call_nix_update('gitlab-shell', gitlab_shell_version) _call_nix_update('gitlab-shell', gitlab_shell_version)
repo = GitLabRepo(repo='gitlab-shell')
gitlab_shell_dir = pathlib.Path(__file__).parent / 'gitlab-shell'
@cli.command('update-gitlab-workhorse') @cli.command('update-gitlab-workhorse')
def update_gitlab_workhorse(): def update_gitlab_workhorse():
"""Update gitlab-workhorse""" """Update gitlab-workhorse"""
data = _get_data_json() data = _get_data_json()
gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION'] gitlab_workhorse_version = data['version']
_call_nix_update('gitlab-workhorse', gitlab_workhorse_version) _call_nix_update('gitlab-workhorse', gitlab_workhorse_version)
repo = GitLabRepo('gitlab-org', 'gitlab-workhorse')
gitlab_workhorse_dir = pathlib.Path(__file__).parent / 'gitlab-workhorse'
@cli.command('update-all') @cli.command('update-all')
@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') @click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'')

1776
pkgs/applications/version-management/gitlab/yarnPkgs.nix
View file

File diff suppressed because it is too large Load diff

11
pkgs/build-support/fetchzip/default.nix
View file

@ -5,16 +5,19 @@
# (e.g. due to minor changes in the compression algorithm, or changes # (e.g. due to minor changes in the compression algorithm, or changes
# in timestamps). # in timestamps).
{ fetchurl, unzip }: { lib, fetchurl, unzip }:
{ # Optionally move the contents of the unpacked tree up one level. { # Optionally move the contents of the unpacked tree up one level.
stripRoot ? true stripRoot ? true
, url , url ? ""
, urls ? []
, extraPostFetch ? "" , extraPostFetch ? ""
, name ? "source" , name ? "source"
, ... } @ args: , ... } @ args:
(fetchurl ({ (fetchurl (let
basename = baseNameOf (if url != "" then url else builtins.head urls);
in {
inherit name; inherit name;
recursiveHash = true; recursiveHash = true;
@ -27,7 +30,7 @@
mkdir "$unpackDir" mkdir "$unpackDir"
cd "$unpackDir" cd "$unpackDir"
renamed="$TMPDIR/${baseNameOf url}" renamed="$TMPDIR/${basename}"
mv "$downloadedFile" "$renamed" mv "$downloadedFile" "$renamed"
unpackFile "$renamed" unpackFile "$renamed"
'' ''

2
pkgs/data/fonts/paratype-pt/mono.nix
View file

@ -3,7 +3,7 @@
fetchzip { fetchzip {
name = "paratype-pt-mono"; name = "paratype-pt-mono";
url = [ urls = [
"https://company.paratype.com/system/attachments/631/original/ptmono.zip" "https://company.paratype.com/system/attachments/631/original/ptmono.zip"
"http://rus.paratype.ru/system/attachments/631/original/ptmono.zip" "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip"
]; ];

2
pkgs/data/fonts/paratype-pt/sans.nix
View file

@ -3,7 +3,7 @@
fetchzip { fetchzip {
name = "paratype-pt-sans"; name = "paratype-pt-sans";
url = [ urls = [
"https://company.paratype.com/system/attachments/629/original/ptsans.zip" "https://company.paratype.com/system/attachments/629/original/ptsans.zip"
"http://rus.paratype.ru/system/attachments/629/original/ptsans.zip" "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip"
]; ];

2
pkgs/data/fonts/paratype-pt/serif.nix
View file

@ -3,7 +3,7 @@
fetchzip { fetchzip {
name = "paratype-pt-serif"; name = "paratype-pt-serif";
url = [ urls = [
"https://company.paratype.com/system/attachments/634/original/ptserif.zip" "https://company.paratype.com/system/attachments/634/original/ptserif.zip"
"http://rus.paratype.ru/system/attachments/634/original/ptserif.zip" "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip"
]; ];

8
pkgs/development/compilers/reason/default.nix
View file

@ -3,14 +3,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-reason-${version}"; pname = "ocaml${ocaml.version}-reason";
version = "3.6.2"; version = "3.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "reason"; repo = "reason";
rev = "6017d6dd930f4989177c3f7c3c20cffbaabaa49a"; rev = "daa11255cb4716ce1c370925251021bd6e3bd974";
sha256 = "17wkcl3r0ckhlki9fk0mcwbnd7kpkqm1h0xjw2j2x1097n470df0"; sha256 = "0m6ldrci1a4j0qv1cbwh770zni3al8qxsphl353rv19f6rblplhs";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

10
pkgs/development/libraries/pipewire/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitLab , fetchFromGitLab
, fetchpatch
, removeReferencesTo , removeReferencesTo
, meson , meson
, ninja , ninja
@ -43,7 +42,7 @@ let
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
pname = "pipewire"; pname = "pipewire";
version = "0.3.24"; version = "0.3.25";
outputs = [ outputs = [
"out" "out"
@ -61,7 +60,7 @@ let
owner = "pipewire"; owner = "pipewire";
repo = "pipewire"; repo = "pipewire";
rev = version; rev = version;
hash = "sha256:PcY20FTtUtJYAwCscEs+HfkdwDksYPFZIVTVORP1ooI="; hash = "sha256:EbXWcf6QLtbvm6/eXBI+PF2sTw2opYfmc+H/SMDEH1U=";
}; };
patches = [ patches = [
@ -75,11 +74,6 @@ let
./0070-installed-tests-path.patch ./0070-installed-tests-path.patch
# Add flag to specify configuration directory (different from the installation directory). # Add flag to specify configuration directory (different from the installation directory).
./0080-pipewire-config-dir.patch ./0080-pipewire-config-dir.patch
# Fix JSON parser.
(fetchpatch {
url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/34800dc0191a4ee7a329eeb361a6f2ccf4a75176.diff";
sha256 = "0dzxzr408qqzf0252nwg14709p1lb2k826i3kdzg6djq8w98d5aj";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

2
pkgs/development/ocaml-modules/merlin-extend/default.nix
View file

@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "merlin-extend"; pname = "merlin-extend";
version = "0.6"; version = "0.6";
useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/let-def/merlin-extend/releases/download/v${version}/merlin-extend-v${version}.tbz"; url = "https://github.com/let-def/merlin-extend/releases/download/v${version}/merlin-extend-v${version}.tbz";
sha256 = "0hvc4mz92x3rl2dxwrhvhzwl4gilnyvvwcqgr45vmdpyjyp3dwn2"; sha256 = "0hvc4mz92x3rl2dxwrhvhzwl4gilnyvvwcqgr45vmdpyjyp3dwn2";

8
pkgs/development/ocaml-modules/ocamlnet/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkg-config, ncurses, ocaml, findlib, ocaml_pcre, camlzip { stdenv, lib, fetchurl, pkg-config, which, ncurses, ocaml, findlib, ocaml_pcre, camlzip
, gnutls, nettle , gnutls, nettle
}: }:
@ -8,14 +8,14 @@ else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ocamlnet-${version}"; name = "ocaml${ocaml.version}-ocamlnet-${version}";
version = "4.1.8"; version = "4.1.9";
src = fetchurl { src = fetchurl {
url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
sha256 = "1x703mjqsv9nvffnkj5i36ij2s5zfvxxll2z1qj6a7p428b2yfnm"; sha256 = "1vlwxjxr946gdl61a1d7yk859cijq45f60dhn54ik3w4g6cx33pr";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config which ];
buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ]; buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ];
createFindlibDestdir = true; createFindlibDestdir = true;

5
pkgs/development/ocaml-modules/sqlite3/default.nix
View file

@ -1,8 +1,9 @@
{ lib, fetchurl, sqlite, pkg-config, buildDunePackage }: { lib, fetchurl, sqlite, pkg-config, buildDunePackage, dune-configurator }:
buildDunePackage rec { buildDunePackage rec {
pname = "sqlite3"; pname = "sqlite3";
version = "5.0.2"; version = "5.0.2";
useDune2 = true;
minimumOCamlVersion = "4.05"; minimumOCamlVersion = "4.05";
src = fetchurl { src = fetchurl {
@ -11,7 +12,7 @@ buildDunePackage rec {
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ sqlite ]; buildInputs = [ dune-configurator sqlite ];
meta = with lib; { meta = with lib; {
homepage = "http://mmottl.github.io/sqlite3-ocaml/"; homepage = "http://mmottl.github.io/sqlite3-ocaml/";

51
pkgs/development/python-modules/aiodiscover/default.nix Normal file
View file

@ -0,0 +1,51 @@
{ lib
, async-dns
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, ifaddr
, pyroute2
, pythonOlder
}:
buildPythonPackage rec {
pname = "aiodiscover";
version = "1.3.2";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = "v${version}";
sha256 = "0qg2wm6ddsfai788chylr5ynrvakwg91q3dszz7dxzbkfdcxixj3";
};
patches = [
(fetchpatch {
name = "remove-entry_point.patch";
url = "https://github.com/bdraco/aiodiscover/commit/4c497fb7d4c8685a78209c710e92e0bd17f46bb2.patch";
sha256 = "0py9alhg6qdncbn6a04mrnjhs4j19kg759dv69knpqzryikcfa63";
})
];
propagatedBuildInputs = [
async-dns
pyroute2
ifaddr
];
postPatch = ''
substituteInPlace setup.py --replace '"pytest-runner>=5.2",' ""
'';
# Tests require access to /etc/resolv.conf
# pythonImportsCheck doesn't work as async-dns wants to create its CONFIG_DIR
doCheck = false;
meta = with lib; {
description = "Python module to discover hosts via ARP and PTR lookup";
homepage = "https://github.com/bdraco/aiodiscover";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

52
pkgs/development/python-modules/async-dns/default.nix Normal file
View file

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, poetry-core
, python
, pythonOlder
}:
buildPythonPackage rec {
pname = "async-dns";
version = "1.1.9";
disabled = pythonOlder "3.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "gera2ld";
repo = "async_dns";
rev = "v${version}";
sha256 = "1z8j0s3dwcyavarhx41q75k1cmfzmwiqdh4svv3v15np26cywyag";
};
nativeBuildInputs = [
poetry-core
];
patches = [
# Switch to poetry-core, https://github.com/gera2ld/async_dns/pull/22
# Can be remove for async-dns>1.1.9
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/gera2ld/async_dns/commit/25fee497aae3bde0ddf9f8804d249a27edbe607e.patch";
sha256 = "0w4zlppnp1a2q1wasc95ymqx3djswl32y5nw6fvz3nn8jg4gc743";
})
];
checkPhase = ''
export HOME=$TMPDIR
# Test needs network access
rm tests/test_resolver.py
${python.interpreter} -m unittest
'';
pythonImportsCheck = [ "async_dns" ];
meta = with lib; {
description = "Python DNS library";
homepage = "https://github.com/gera2ld/async_dns";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/boto3/default.nix
View file

@ -13,11 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "boto3"; pname = "boto3";
version = "1.17.45"; # N.B: if you change this, change botocore and awscli to a matching version version = "1.17.46"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-7dMELrpeIZFKfQmcuKJfAJwMQqlSnJrE9bhSrVs6ys8="; sha256 = "sha256-Xe4Vv5YepYTWgfrkLFADTIOXF+dFTD2pDLV6bFLpdTI=";
}; };
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

4
pkgs/development/python-modules/botocore/default.nix
View file

@ -13,11 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "botocore"; pname = "botocore";
version = "1.20.45"; # N.B: if you change this, change boto3 and awscli to a matching version version = "1.20.46"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-s6WbIcb0BNLF3LGiFphISlrBu+Y5ypey4PDhnFLC6+E="; sha256 = "sha256-ULvD6TQcfaqCGduYw48mASoVHKiPomAUjlvzrcvLlUE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

3
pkgs/development/python-modules/gdown/default.nix
View file

@ -5,6 +5,7 @@
, requests , requests
, tqdm , tqdm
, setuptools , setuptools
, six
}: }:
buildPythonApplication rec { buildPythonApplication rec {
@ -16,7 +17,7 @@ buildPythonApplication rec {
sha256 = "4b3a1301e57bfd8dce939bf25ef8fbb4b23967fd0f878eede328bdcc41386bac"; sha256 = "4b3a1301e57bfd8dce939bf25ef8fbb4b23967fd0f878eede328bdcc41386bac";
}; };
propagatedBuildInputs = [ filelock requests tqdm setuptools ]; propagatedBuildInputs = [ filelock requests tqdm setuptools six ];
checkPhase = '' checkPhase = ''
$out/bin/gdown --help > /dev/null $out/bin/gdown --help > /dev/null

43
pkgs/development/python-modules/homepluscontrol/default.nix Normal file
View file

@ -0,0 +1,43 @@
{ lib
, aiohttp
, aioresponses
, buildPythonPackage
, fetchFromGitHub
, pyjwt
, pytestCheckHook
, pythonOlder
, yarl
}:
buildPythonPackage rec {
pname = "homepluscontrol";
version = "0.0.5";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "chemaaa";
repo = pname;
rev = version;
sha256 = "1nd3a7nhh1xb70cdh2h2bimwbffvpc3457smyzr9fqkjwfbcrr93";
};
propagatedBuildInputs = [
aiohttp
pyjwt
yarl
];
checkInputs = [
aioresponses
pytestCheckHook
];
pythonImportsCheck = [ "homepluscontrol" ];
meta = with lib; {
description = "Python API to interact with the Legrand Eliot Home and Control";
homepage = "https://github.com/chemaaa/homepluscontrol";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
};
}

17
pkgs/development/python-modules/pubnub/default.nix
View file

@ -13,16 +13,17 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pubnub"; pname = "pubnub";
version = "4.8.0"; version = "5.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = "python"; repo = "python";
rev = "v${version}"; rev = "v${version}";
sha256 = "16wjal95042kh5fxhvji0rwmw892pacqcnyms520mw15wcwilqir"; sha256 = "sha256-ir8f8A6XuN1ZQIYQbArChLzTlYu4ZKpkoOXQtSLOvKg=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp
cbor2 cbor2
pycryptodomex pycryptodomex
requests requests
@ -30,19 +31,15 @@ buildPythonPackage rec {
]; ];
checkInputs = [ checkInputs = [
aiohttp
pycryptodomex
pytest-asyncio pytest-asyncio
pytestCheckHook pytestCheckHook
pytest-vcr pytest-vcr
]; ];
# Some tests don't pass with recent releases of tornado/twisted # Some tests don't pass with recent releases of twisted
pytestFlagsArray = [ disabledTestPaths = [
"--ignore tests/integrational" "tests/integrational"
"--ignore tests/manual/asyncio" "tests/manual/asyncio"
"--ignore tests/manual/tornado/test_reconnections.py"
]; ];
pythonImportsCheck = [ "pubnub" ]; pythonImportsCheck = [ "pubnub" ];

30
pkgs/development/python-modules/pytest-raises/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pytest-raises";
version = "0.11";
src = fetchFromGitHub {
owner = "Lemmons";
repo = pname;
rev = version;
sha256 = "0gbb4kml2qv7flp66i73mgb4qihdaybb6c96b5dw3mhydhymcsy2";
};
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "pytest_raises" ];
meta = with lib; {
description = "An implementation of pytest.raises as a pytest.mark fixture";
homepage = "https://github.com/Lemmons/pytest-raises";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

5
pkgs/development/python-modules/requests-aws4auth/default.nix
View file

@ -1,4 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, python, requests }: { lib, buildPythonPackage, fetchPypi, python, requests, six }:
with lib; with lib;
buildPythonPackage rec { buildPythonPackage rec {
pname = "requests-aws4auth"; pname = "requests-aws4auth";
@ -9,7 +10,7 @@ buildPythonPackage rec {
sha256 = "9a4a5f4a61c49f098f5f669410308ac5b0ea2682fd511ee3a4f9ff73b5bb275a"; sha256 = "9a4a5f4a61c49f098f5f669410308ac5b0ea2682fd511ee3a4f9ff73b5bb275a";
}; };
propagatedBuildInputs = [ requests ]; propagatedBuildInputs = [ requests six ];
# pypi package no longer contains tests # pypi package no longer contains tests
doCheck = false; doCheck = false;

34
pkgs/development/python-modules/ronin/default.nix Normal file
View file

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, blessings
, colorama
, glob2
}:
buildPythonPackage rec {
pname = "ronin";
version = "1.1.1";
src = fetchPypi {
inherit version pname;
hash = "sha256-5gZ8S0NR4JzKBIdi/xYtVmFg9ObbCSkT7sz+OKWnK/U=";
};
propagatedBuildInputs = [
blessings
colorama
glob2
];
pythonImportsCheck = [
"ronin"
];
meta = with lib; {
homepage = "https://github.com/tliron/ronin/";
description = "A straightforward but powerful build system based on Ninja and Python";
license = licenses.asl20;
maintainers = with maintainers; [ AndersonTorres ];
};
}

28
pkgs/development/python-modules/screenlogicpy/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "screenlogicpy";
version = "0.3.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0gn2mf2n2g1ffdbijrydgb7dgd60lkvckblx6s86kxlkrp1wqgrq";
};
# Project doesn't publish tests
# https://github.com/dieselrabbit/screenlogicpy/issues/8
doCheck = false;
pythonImportsCheck = [ "screenlogicpy" ];
meta = with lib; {
description = "Python interface for Pentair Screenlogic devices";
homepage = "https://github.com/dieselrabbit/screenlogicpy";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
};
}

58
pkgs/development/python-modules/yalexs/default.nix Normal file
View file

@ -0,0 +1,58 @@
{ lib
, aiofiles
, aiohttp
, aioresponses
, aiounittest
, asynctest
, buildPythonPackage
, fetchFromGitHub
, pubnub
, pytestCheckHook
, python-dateutil
, pythonOlder
, requests
, requests-mock
}:
buildPythonPackage rec {
pname = "yalexs";
version = "1.1.10";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = "v${version}";
sha256 = "1qmxiafqmh51i3l30pajaqj5h0kziq4d37fn6hl58429bb85dpp9";
};
propagatedBuildInputs = [
aiofiles
aiohttp
pubnub
python-dateutil
requests
];
checkInputs = [
aioresponses
aiounittest
asynctest
pytestCheckHook
requests-mock
];
postPatch = ''
# Not used requirement
substituteInPlace setup.py --replace '"vol",' ""
'';
pythonImportsCheck = [ "yalexs" ];
meta = with lib; {
description = "Python API for Yale Access (formerly August) Smart Lock and Doorbell";
homepage = "https://github.com/bdraco/yalexs";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

6
pkgs/development/ruby-modules/gem-config/default.nix
View file

@ -25,7 +25,7 @@
, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
, bundler, libsass, libselinux ? null, libsepol ? null , bundler, libsass, libselinux ? null, libsepol ? null, shared-mime-info
}@args: }@args:
let let
@ -164,6 +164,10 @@ in
''; '';
}; };
mimemagic = attrs: {
FREEDESKTOP_MIME_TYPES_PATH = "${shared-mime-info}/share/mime/packages/freedesktop.org.xml";
};
mini_magick = attrs: { mini_magick = attrs: {
postInstall = '' postInstall = ''
installPath=$(cat $out/nix-support/gem-meta/install-path) installPath=$(cat $out/nix-support/gem-meta/install-path)

6
pkgs/development/tools/build-managers/sbt-extras/default.nix
View file

@ -3,14 +3,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sbt-extras"; pname = "sbt-extras";
rev = "b430596eb8566a59793ea0b8ddd2c693505e801f"; rev = "a76f1f15e6ec39d886f8bf07d5bdfaf70cdc62d8";
version = "2021-03-29"; version = "2021-04-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "paulp"; owner = "paulp";
repo = "sbt-extras"; repo = "sbt-extras";
inherit rev; inherit rev;
sha256 = "0r0ysv7dzrlmj3c82fv60i2490ky7q70jlv40q7zdmm5q2wp7y63"; sha256 = "0zmhn8nvzrbw047g5z4q2slp0wdg6pvfh2pqnpwcq1hscf7dvz8f";
}; };
dontBuild = true; dontBuild = true;

4
pkgs/development/tools/continuous-integration/jenkins/default.nix
View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jenkins"; pname = "jenkins";
version = "2.277.1"; version = "2.277.2";
src = fetchurl { src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "0lficvngxzl7q088n3ssnnhjicd0xxr0k3n0inz7pvjj27dl35rr"; sha256 = "08lv5v5kxp9ln798gjmh8j9a8r8xc471fbhiz2l7gxncpxn50ga2";
}; };
buildCommand = '' buildCommand = ''

2
pkgs/development/tools/continuous-integration/laminar/default.nix
View file

@ -28,7 +28,7 @@ let
sha256 = "1jh4h12qchsba03dx03mrvs4r8g9qfjn56xm56jqzgqf7r209xq9"; sha256 = "1jh4h12qchsba03dx03mrvs4r8g9qfjn56xm56jqzgqf7r209xq9";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "laminar"; pname = "laminar";
version = "1.0"; version = "1.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz"; url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz";

4
pkgs/games/wesnoth/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wesnoth"; pname = "wesnoth";
version = "1.14.15"; version = "1.14.16";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = version; rev = version;
owner = "wesnoth"; owner = "wesnoth";
repo = "wesnoth"; repo = "wesnoth";
sha256 = "sha256-HbQy5yhNe6HFydipqh2wWcyLfIjbdRjcBQaqAOtBJsY="; sha256 = "sha256-QMz7atxol18r//UNb6+H6xAAEQdR4hAN8UW0KeGSH1g=";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

2
pkgs/servers/home-assistant/appdaemon.nix
View file

@ -82,6 +82,6 @@ in python.pkgs.buildPythonApplication rec {
description = "Sandboxed Python execution environment for writing automation apps for Home Assistant"; description = "Sandboxed Python execution environment for writing automation apps for Home Assistant";
homepage = "https://github.com/AppDaemon/appdaemon"; homepage = "https://github.com/AppDaemon/appdaemon";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ]; maintainers = teams.home-assistant.members;
}; };
} }

2
pkgs/servers/home-assistant/cli.nix
View file

@ -36,6 +36,6 @@ python3.pkgs.buildPythonApplication rec {
description = "Command-line tool for Home Assistant"; description = "Command-line tool for Home Assistant";
homepage = "https://github.com/home-assistant/home-assistant-cli"; homepage = "https://github.com/home-assistant/home-assistant-cli";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ]; maintainers = teams.home-assistant.members;
}; };
} }

10
pkgs/servers/home-assistant/default.nix
View file

@ -384,6 +384,14 @@ in with py.pkgs; buildPythonApplication rec {
preCheck = '' preCheck = ''
# the tests require the existance of a media dir # the tests require the existance of a media dir
mkdir /build/media mkdir /build/media
# error out when component test directory is missing, otherwise hidden by xdist execution :(
for component in ${lib.concatStringsSep " " (map lib.escapeShellArg componentTests)}; do
test -d "tests/components/$component" || {
>2& echo "ERROR: Tests for component '$component' were enabled, but they do not exist!"
exit 1
}
done
''; '';
passthru = { passthru = {
@ -397,7 +405,7 @@ in with py.pkgs; buildPythonApplication rec {
homepage = "https://home-assistant.io/"; homepage = "https://home-assistant.io/";
description = "Open source home automation that puts local control and privacy first"; description = "Open source home automation that puts local control and privacy first";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ globin mic92 hexa ]; maintainers = teams.home-assistant.members;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

2
pkgs/servers/home-assistant/frontend.nix
View file

@ -21,6 +21,6 @@ buildPythonPackage rec {
description = "Polymer frontend for Home Assistant"; description = "Polymer frontend for Home Assistant";
homepage = "https://github.com/home-assistant/home-assistant-polymer"; homepage = "https://github.com/home-assistant/home-assistant-polymer";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ globin ]; maintainers = teams.home-assistant.members;
}; };
} }

2
pkgs/servers/monitoring/zabbix/agent2.nix
View file

@ -12,7 +12,7 @@ import ./versions.nix ({ version, sha256 }:
modRoot = "src/go"; modRoot = "src/go";
vendorSha256 = "1ral3xg58x0lf5vl839nlabf443yzqnbrlzm0q127mvv412f5ajc"; vendorSha256 = "07caz0jfy0r1vb1h9mhb169wyn949z9xj0pmvyamr2d8y3k3hbyd";
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libiconv openssl pcre zlib ]; buildInputs = [ libiconv openssl pcre zlib ];

13
pkgs/servers/monitoring/zabbix/versions.nix
View file

@ -1,16 +1,11 @@
generic: { generic: {
v50 = generic { v50 = generic {
version = "5.0.9"; version = "5.0.10";
sha256 = "16vwh01hlxmh9qg3d7q1vsmz3bwydk7v7da58d3764ldmh8ag199"; sha256 = "15kbbj1vclsys1z3ghcz9j5faz67k3z8yl81bn7bhmqaflavgicb";
}; };
v40 = generic { v40 = generic {
version = "4.0.29"; version = "4.0.30";
sha256 = "0qghx7r7rbyya79mfsvr5fqws2d8ffn86zfdkzdrnmyl0x25fr9y"; sha256 = "17h831a1rw245kz37pw5haxq09k9m76bf0bz0jgg9s0q1j7hvywh";
};
v30 = generic {
version = "3.0.32";
sha256 = "1n9l0llmifmg5zzh2jzqax8y23ch7250v36bcfkpizvr8wji7xi7";
}; };
} }

6
pkgs/shells/fish/default.nix
View file

@ -131,7 +131,7 @@ let
fish = stdenv.mkDerivation rec { fish = stdenv.mkDerivation rec {
pname = "fish"; pname = "fish";
version = "3.2.1"; version = "3.2.2";
src = fetchurl { src = fetchurl {
# There are differences between the release tarball and the tarball GitHub # There are differences between the release tarball and the tarball GitHub
@ -141,14 +141,14 @@ let
# --version`), as well as the local documentation for all builtins (and # --version`), as well as the local documentation for all builtins (and
# maybe other things). # maybe other things).
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "2OSfQJDTd43xfdgl5KKoAZIBVoJCPNndArZnXWXDr1s="; sha256 = "WUTaGoiT0RsIKKT9kTbuF0VJ2v+z0K392JF4Vv5rQAk=";
}; };
# Fix FHS paths in tests # Fix FHS paths in tests
postPatch = '' postPatch = ''
# src/fish_tests.cpp # src/fish_tests.cpp
sed -i 's|/bin/ls|${coreutils}/bin/ls|' src/fish_tests.cpp sed -i 's|/bin/ls|${coreutils}/bin/ls|' src/fish_tests.cpp
sed -i 's|L"/usr"|L"/nix"|' src/fish_tests.cpp sed -i 's|is_potential_path(L"/usr"|is_potential_path(L"/nix"|' src/fish_tests.cpp
sed -i 's|L"/bin/echo"|L"${coreutils}/bin/echo"|' src/fish_tests.cpp sed -i 's|L"/bin/echo"|L"${coreutils}/bin/echo"|' src/fish_tests.cpp
sed -i 's|L"/bin/c"|L"${coreutils}/bin/c"|' src/fish_tests.cpp sed -i 's|L"/bin/c"|L"${coreutils}/bin/c"|' src/fish_tests.cpp
sed -i 's|L"/bin/ca"|L"${coreutils}/bin/ca"|' src/fish_tests.cpp sed -i 's|L"/bin/ca"|L"${coreutils}/bin/ca"|' src/fish_tests.cpp

6
pkgs/shells/zsh/oh-my-zsh/default.nix
View file

@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2021-04-06"; version = "2021-04-07";
pname = "oh-my-zsh"; pname = "oh-my-zsh";
rev = "1670f1cafcc919f35a2a52eaceeca315d293b679"; rev = "3f50482674c2b3153590a4aba92fbfa1c01bc583";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; inherit rev;
owner = "ohmyzsh"; owner = "ohmyzsh";
repo = "ohmyzsh"; repo = "ohmyzsh";
sha256 = "1nphmg5sss860xhrc6iaiimzvfklb82kxwwivybh0ccyk2chb7i0"; sha256 = "1ypx15p4c3mrs99xwkii3hwzlpk34mdldlymwiwad1c1ihw1r7r9";
}; };
installPhase = '' installPhase = ''

4
pkgs/tools/admin/awscli/default.nix
View file

@ -21,11 +21,11 @@ let
in in
with py.pkgs; buildPythonApplication rec { with py.pkgs; buildPythonApplication rec {
pname = "awscli"; pname = "awscli";
version = "1.19.45"; # N.B: if you change this, change botocore and boto3 to a matching version too version = "1.19.46"; # N.B: if you change this, change botocore and boto3 to a matching version too
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-eYH8AbMYs9Pez+DfKS4OyhD39+vKQZ2uegMwi6qHr2w="; sha256 = "sha256-Cs+VOgbW/x1vsgMPgUG6PRlqZcvzHQCIRYuR6AsSYP4=";
}; };
# https://github.com/aws/aws-cli/issues/4837 # https://github.com/aws/aws-cli/issues/4837

4
pkgs/tools/virtualization/ec2instanceconnectcli/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, boto3 }: { lib, buildPythonPackage, fetchPypi, boto3, cryptography }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "ec2instanceconnectcli"; pname = "ec2instanceconnectcli";
@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "sha256-VaCyCnEhSx1I3bNo57p0IXf92+tO1tT7KSUXzO1IyIU="; sha256 = "sha256-VaCyCnEhSx1I3bNo57p0IXf92+tO1tT7KSUXzO1IyIU=";
}; };
propagatedBuildInputs = [ boto3 ]; propagatedBuildInputs = [ boto3 cryptography ];
# has no tests # has no tests
doCheck = false; doCheck = false;

1
pkgs/top-level/aliases.nix
View file

@ -836,6 +836,7 @@ mapAliases ({
ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";
yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08 yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08
yuzu = yuzu-mainline; # added 2021-01-25 yuzu = yuzu-mainline; # added 2021-01-25
zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # added 2021-04-07
zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # added 2021-03-28 zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # added 2021-03-28
zdfmediathk = mediathekview; # added 2019-01-19 zdfmediathk = mediathekview; # added 2019-01-19

5
pkgs/top-level/all-packages.nix
View file

@ -9031,9 +9031,7 @@ in
inherit lib udisks2 python3; inherit lib udisks2 python3;
}; };
viking = callPackage ../applications/misc/viking { viking = callPackage ../applications/misc/viking { };
inherit (gnome2) scrollkeeper;
};
vim-vint = callPackage ../development/tools/vim-vint { }; vim-vint = callPackage ../development/tools/vim-vint { };
@ -19231,7 +19229,6 @@ in
zabbix50 = recurseIntoAttrs (zabbixFor "v50"); zabbix50 = recurseIntoAttrs (zabbixFor "v50");
zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40"); zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40");
zabbix30 = dontRecurseIntoAttrs (zabbixFor "v30");
zabbix = zabbix50; zabbix = zabbix50;

14
pkgs/top-level/python-packages.nix
View file

@ -239,6 +239,8 @@ in {
aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; aiocontextvars = callPackage ../development/python-modules/aiocontextvars { };
aiodiscover = callPackage ../development/python-modules/aiodiscover { };
aiodns = callPackage ../development/python-modules/aiodns { }; aiodns = callPackage ../development/python-modules/aiodns { };
aioeafm = callPackage ../development/python-modules/aioeafm { }; aioeafm = callPackage ../development/python-modules/aioeafm { };
@ -541,6 +543,8 @@ in {
async_generator = callPackage ../development/python-modules/async_generator { }; async_generator = callPackage ../development/python-modules/async_generator { };
async-dns = callPackage ../development/python-modules/async-dns { };
asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { }; asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { };
asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { }; asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { };
@ -3115,6 +3119,8 @@ in {
homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { }; homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { };
homepluscontrol = callPackage ../development/python-modules/homepluscontrol { };
hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue {
inherit python; inherit python;
}); });
@ -6579,6 +6585,8 @@ in {
pytest-quickcheck = self.pytestquickcheck; pytest-quickcheck = self.pytestquickcheck;
pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { };
pytest-raises = callPackage ../development/python-modules/pytest-raises { };
pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { };
pytest-randomly = callPackage ../development/python-modules/pytest-randomly { }; pytest-randomly = callPackage ../development/python-modules/pytest-randomly { };
@ -7351,6 +7359,8 @@ in {
roombapy = callPackage ../development/python-modules/roombapy { }; roombapy = callPackage ../development/python-modules/roombapy { };
ronin = callPackage ../development/python-modules/ronin { };
rope = callPackage ../development/python-modules/rope { }; rope = callPackage ../development/python-modules/rope { };
ROPGadget = callPackage ../development/python-modules/ROPGadget { }; ROPGadget = callPackage ../development/python-modules/ROPGadget { };
@ -7546,6 +7556,8 @@ in {
screeninfo = callPackage ../development/python-modules/screeninfo { }; screeninfo = callPackage ../development/python-modules/screeninfo { };
screenlogicpy = callPackage ../development/python-modules/screenlogicpy { };
scripttest = callPackage ../development/python-modules/scripttest { }; scripttest = callPackage ../development/python-modules/scripttest { };
scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; };
@ -9037,6 +9049,8 @@ in {
yalesmartalarmclient = callPackage ../development/python-modules/yalesmartalarmclient { }; yalesmartalarmclient = callPackage ../development/python-modules/yalesmartalarmclient { };
yalexs = callPackage ../development/python-modules/yalexs { };
yamale = callPackage ../development/python-modules/yamale { }; yamale = callPackage ../development/python-modules/yamale { };
yamllint = callPackage ../development/python-modules/yamllint { }; yamllint = callPackage ../development/python-modules/yamllint { };