colin/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-02-18 00:40:58 +00:00 committed by GitHub
commit 683536ab2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 1600 additions and 1198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/editors/eclipse/plugins.nix
View File

@ -413,6 +413,22 @@ rec {
}; };
}; };
freemarker = buildEclipseUpdateSite rec {
name = "freemarker-${version}";
version = "1.5.305";
src = fetchzip {
url = "https://github.com/ddekany/jbosstools-freemarker/releases/download/v${version}/freemarker.site-${version}.zip";
sha256 = "1qrhi300vk07gi14r445wvy0bvghbjd6c4k7q09pqpaxv6raiczn";
stripRoot = false;
};
meta = with lib; {
homepage = "https://github.com/ddekany/jbosstools-freemarker";
description = "Plugin that provides an editor for Apache FreeMarker files";
};
};
gnuarmeclipse = buildEclipseUpdateSite rec { gnuarmeclipse = buildEclipseUpdateSite rec {
name = "gnuarmeclipse-${version}"; name = "gnuarmeclipse-${version}";
version = "3.1.1-201606210758"; version = "3.1.1-201606210758";

6
pkgs/applications/networking/cluster/argocd/default.nix
View File

@ -2,14 +2,14 @@
buildGoModule rec { buildGoModule rec {
pname = "argocd"; pname = "argocd";
version = "1.8.3"; version = "1.8.4";
commit = "ef5010c3a0b5e027fd642732d03c5b0391b1e574"; commit = "28aea3dfdede00443b52cc584814d80e8f896200";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "argoproj"; owner = "argoproj";
repo = "argo-cd"; repo = "argo-cd";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-do5DAxaQ1gBdvNN/YGKAkmkFcJ+j/ojBaWPwrXXQko0="; sha256 = "sha256:155396rnihha31jxy0zk1jykiirpv4dhc69w45y6nx3nx4k0gwhk";
}; };
vendorSha256 = "sha256-6DOay+aeXz7EQKe5SzQSmg/5KyUI0g6wzPgx/+F2RW4="; vendorSha256 = "sha256-6DOay+aeXz7EQKe5SzQSmg/5KyUI0g6wzPgx/+F2RW4=";

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.6"; version = "0.14.7";
sha256 = "0ba3vd6lswy4pd0qywdbx8cf71j5z3p8p8kdjs9m4qbyrzsbq0fk"; sha256 = "0lnq65ibdxrw2rlyipk469a5hh16vgym1698nmfn62ak8fdrd8la";
vendorSha256 = "0pk5mgj19a8by7wbn5xd6kgr1kxrazhvg851fvs8mq3j0ayb32nb"; vendorSha256 = "0pk5mgj19a8by7wbn5xd6kgr1kxrazhvg851fvs8mq3j0ayb32nb";
patches = [ ./provider-path.patch ]; patches = [ ./provider-path.patch ];
passthru = { inherit plugins; }; passthru = { inherit plugins; };

5
pkgs/applications/networking/maestral-qt/default.nix
View File

@ -6,18 +6,17 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "maestral-qt"; pname = "maestral-qt";
version = "1.3.1"; version = "1.4.2";
disabled = python3.pkgs.pythonOlder "3.6"; disabled = python3.pkgs.pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SamSchott"; owner = "SamSchott";
repo = "maestral-qt"; repo = "maestral-qt";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-2S2sa2/HVt3IRsE98PT2XwpONjaYENBzYW+ezBFrJYI="; sha256 = "sha256-cPH0wD7RL3OifDTD48x58I4qeaLALOMFnfWXjE2/lUQ=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
bugsnag
click click
markdown2 markdown2
maestral maestral

101
pkgs/applications/radio/cqrlog/default.nix Normal file
View File

@ -0,0 +1,101 @@
{ lib
, stdenv
, fetchFromGitHub
, fpc
, lazarus
, atk
, cairo
, gdk-pixbuf
, glib
, gtk2-x11
, libX11
, pango
, hamlib
, mysql57
, tqsl
, xdg-utils
, xplanet
, autoPatchelfHook
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "cqrlog";
version = "2.5.2";
src = fetchFromGitHub {
owner = "ok2cqr";
repo = "cqrlog";
rev = "v${version}";
sha256 = "0zzcg0bl6mq4wfifj998x9x09w8sigbh46synpqx034fpr0swyhb";
};
# Adds the possiblity to change the lazarus directory,
# otherwise, we would get error : "directory lcl not found"
patches = [ ./fix-makefile-lazarusdir.patch ];
postPatch = ''
substituteInPlace Makefile \
--replace @Lazarusdir@ "${lazarus}/share/lazarus" \
--replace /usr ""
substituteInPlace src/fTRXControl.pas \
--replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld"
substituteInPlace src/fCallAttachment.pas \
--replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
substituteInPlace src/fRotControl.pas \
--replace "/usr/bin/rotctld" "${hamlib}/bin/rotctld"
substituteInPlace src/fPreferences.pas \
--replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld" \
--replace "/usr/bin/rotctld" "${hamlib}/bin/rotctld" \
--replace "/usr/bin/xplanet" "${xplanet}/bin/xplanet"
substituteInPlace src/fLoTWExport.pas \
--replace "/usr/bin/tqsl" "${tqsl}/bin/tqsl"
substituteInPlace src/dUtils.pas \
--replace "/usr/bin/xplanet" "${xplanet}/bin/xplanet" \
--replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld"
# Order is important
substituteInPlace src/dData.pas \
--replace "/usr/bin/mysqld_safe" "${mysql57}/bin/mysqld_safe" \
--replace "/usr/bin/mysqld" "${mysql57}/bin/mysqld"
# To be fail when I need to patch a new hardcoded binary
! grep -C src -RC0 "/usr"
'';
nativeBuildInputs = [ lazarus fpc autoPatchelfHook wrapGAppsHook ];
buildInputs = [
atk
cairo
gdk-pixbuf
glib
gtk2-x11
libX11
pango
];
propagatedBuildInputs = [
hamlib
mysql57
tqsl
xdg-utils
xplanet
];
makeFlags = [
"FPC=fpc"
"PP=fpc"
"DESTDIR=$(out)"
];
postFixup = ''
libmysqlclient=$(find "${mysql57}/lib" -name "libmysqlclient.so.*" | tail -n1)
patchelf --add-needed "$libmysqlclient" "$out/bin/.cqrlog-wrapped"
'';
meta = with lib; {
description = "Linux logging program for amateur radio operators";
homepage = "https://www.cqrlog.com/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ shamilton ];
platforms = platforms.linux;
};
}

13
pkgs/applications/radio/cqrlog/fix-makefile-lazarusdir.patch Normal file
View File

@ -0,0 +1,13 @@
Seulement dans b: logs
diff --color -ur a/Makefile b/Makefile
--- a/Makefile 2021-02-15 17:07:14.333810200 +0100
+++ b/Makefile 2021-02-15 17:19:18.599426984 +0100
@@ -6,7 +6,7 @@
tmpdir = /tmp
cqrlog: src/cqrlog.lpi
- $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
+ $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus --lazarusdir=@Lazarusdir@ src/cqrlog.lpi
$(ST) src/cqrlog
gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz

4
pkgs/applications/version-management/git-and-tools/gh/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gh"; pname = "gh";
version = "1.5.0"; version = "1.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cli"; owner = "cli";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "1f23b8bn867b4zihz8m91xmkclcw1jnqkwi06klhm5576akahigq"; sha256 = "1bylkv3rdz3imy8q4mix6n2yrsmc407c4mddv9l8hm23dxxfj8zh";
}; };
vendorSha256 = "00adc0xjrkjrjh0gxk55vhpgxb5x0j5ialzrdvhlrvhpnb44qrcq"; vendorSha256 = "00adc0xjrkjrjh0gxk55vhpgxb5x0j5ialzrdvhlrvhpnb44qrcq";

12
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,13 +1,13 @@
{ {
"version": "13.7.4", "version": "13.8.4",
"repo_hash": "1ggx76k6941rhccsd585p4h5k4zb87yvg0pmpzhwhh2q4ma2sywm", "repo_hash": "1q8q5v7c6g7yss26d6wg29h28fq1azy1smai97yk80cr0kirab8v",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v13.7.4-ee", "rev": "v13.8.4-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "13.7.4", "GITALY_SERVER_VERSION": "13.8.4",
"GITLAB_PAGES_VERSION": "1.34.0", "GITLAB_PAGES_VERSION": "1.34.0",
"GITLAB_SHELL_VERSION": "13.14.0", "GITLAB_SHELL_VERSION": "13.15.1",
"GITLAB_WORKHORSE_VERSION": "8.58.2" "GITLAB_WORKHORSE_VERSION": "8.59.0"
} }
} }

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

@ -3,7 +3,7 @@ source 'https://rubygems.org'
gem 'rugged', '~> 0.28' gem 'rugged', '~> 0.28'
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.3' gem 'activesupport', '~> 6.0.3.4'
gem 'rdoc', '~> 6.0' gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false

28
pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
View File

@ -2,20 +2,20 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
abstract_type (0.0.7) abstract_type (0.0.7)
actionpack (6.0.3.3) actionpack (6.0.3.4)
actionview (= 6.0.3.3) actionview (= 6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
rack (~> 2.0, >= 2.0.8) rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.0.3.3) actionview (6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (6.0.3.3) activesupport (6.0.3.4)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
@ -86,7 +86,7 @@ GEM
json (2.3.1) json (2.3.1)
licensee (8.9.2) licensee (8.9.2)
rugged (~> 0.24) rugged (~> 0.24)
loofah (2.7.0) loofah (2.8.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
memoizable (0.4.2) memoizable (0.4.2)
@ -96,12 +96,13 @@ GEM
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2020.0512) mime-types-data (3.2020.0512)
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.5.0)
minitest (5.14.2) minitest (5.14.2)
msgpack (1.3.3) msgpack (1.3.3)
multipart-post (2.1.1) multipart-post (2.1.1)
nokogiri (1.10.10) nokogiri (1.11.1)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (1.5.0) nokogumbo (1.5.0)
nokogiri nokogiri
opentracing (0.5.0) opentracing (0.5.0)
@ -117,6 +118,7 @@ GEM
pry (0.12.2) pry (0.12.2)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.9.0) method_source (~> 0.9.0)
racc (1.5.2)
rack (2.2.3) rack (2.2.3)
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
@ -177,7 +179,7 @@ GEM
thread_safe (0.3.6) thread_safe (0.3.6)
thrift (0.11.0.0) thrift (0.11.0.0)
timecop (0.9.1) timecop (0.9.1)
tzinfo (1.2.7) tzinfo (1.2.9)
thread_safe (~> 0.1) thread_safe (~> 0.1)
unicode-display_width (1.7.0) unicode-display_width (1.7.0)
unparser (0.4.7) unparser (0.4.7)
@ -188,13 +190,13 @@ GEM
equalizer (~> 0.0.9) equalizer (~> 0.0.9)
parser (>= 2.6.5) parser (>= 2.6.5)
procto (~> 0.0.2) procto (~> 0.0.2)
zeitwerk (2.4.0) zeitwerk (2.4.2)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
activesupport (~> 6.0.3.3) activesupport (~> 6.0.3.4)
factory_bot factory_bot
faraday (~> 1.0) faraday (~> 1.0)
github-linguist (~> 7.12) github-linguist (~> 7.12)

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

@ -33,17 +33,17 @@ let
}; };
}; };
in buildGoModule rec { in buildGoModule rec {
version = "13.7.4"; version = "13.8.4";
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 = "1inb7xlv8admzy9q1bgxccbrhks0mmc8lng356h39crj5sgaqkmg"; sha256 = "sha256-y8uy70ccQPba+JJmWace4LgLJkJNzVdFhrvq0AB8G5w=";
}; };
vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187"; vendorSha256 = "sha256-oVw6vXI3CyOn4l02PkYx3HVpZfzQPi3yBuf9tRvoWoM=";
passthru = { passthru = {
inherit rubyEnv; inherit rubyEnv;

46
pkgs/applications/version-management/gitlab/gitaly/gemset.nix
View File

@ -13,10 +13,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1p873nqwmpsvmkb5n86d70wndx1qhy15pc9mbcd1mc8sj174578b"; sha256 = "0fbjpnh5hrihc9l35q9why6ip0hcdj42axzbp6b4j1xcy1v1bicj";
type = "gem"; type = "gem";
}; };
version = "6.0.3.3"; version = "6.0.3.4";
}; };
actionview = { actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -24,10 +24,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "08pvmjddlw01q5r9zdfgddwp4csndpf5i2w47677z5r36jznz36q"; sha256 = "0gdz31cq08nrqq6bxqim2qcbzv0fr34z6ycl73dmawpafj33wdkj";
type = "gem"; type = "gem";
}; };
version = "6.0.3.3"; version = "6.0.3.4";
}; };
activesupport = { activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -35,10 +35,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1dmkqbvndbz011a1byg6f990936vfadbnwjwjw9vjzr4kd8bxk96"; sha256 = "1axidc4mikgi4yxs0ynw2c54jyrs5lxprxmzv6m3aayi9rg6rk5j";
type = "gem"; type = "gem";
}; };
version = "6.0.3.3"; version = "6.0.3.4";
}; };
adamantium = { adamantium = {
dependencies = ["ice_nine" "memoizable"]; dependencies = ["ice_nine" "memoizable"];
@ -360,10 +360,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh";
type = "gem"; type = "gem";
}; };
version = "2.7.0"; version = "2.8.0";
}; };
memoizable = { memoizable = {
dependencies = ["thread_safe"]; dependencies = ["thread_safe"];
@ -414,12 +414,14 @@
version = "1.0.2"; version = "1.0.2";
}; };
mini_portile2 = { mini_portile2 = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
type = "gem"; type = "gem";
}; };
version = "2.4.0"; version = "2.5.0";
}; };
minitest = { minitest = {
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
@ -452,15 +454,15 @@
version = "2.1.1"; version = "2.1.1";
}; };
nokogiri = { nokogiri = {
dependencies = ["mini_portile2"]; dependencies = ["mini_portile2" "racc"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
type = "gem"; type = "gem";
}; };
version = "1.10.10"; version = "1.11.1";
}; };
nokogumbo = { nokogumbo = {
dependencies = ["nokogiri"]; dependencies = ["nokogiri"];
@ -538,6 +540,16 @@
}; };
version = "0.12.2"; version = "0.12.2";
}; };
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
type = "gem";
};
version = "1.5.2";
};
rack = { rack = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -819,10 +831,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
type = "gem"; type = "gem";
}; };
version = "1.2.7"; version = "1.2.9";
}; };
unicode-display_width = { unicode-display_width = {
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
@ -850,9 +862,9 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k"; sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
type = "gem"; type = "gem";
}; };
version = "2.4.0"; version = "2.4.2";
}; };
} }

4
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
View File

@ -2,12 +2,12 @@
buildGoModule rec { buildGoModule rec {
pname = "gitlab-shell"; pname = "gitlab-shell";
version = "13.14.0"; version = "13.15.1";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-shell"; repo = "gitlab-shell";
rev = "v${version}"; rev = "v${version}";
sha256 = "171c4rfffb73198fhlwk8rq7xy4b4zrnssi8c1wd0x82kqv6csb0"; sha256 = "sha256-wDZLcCBbWjG6wIcEj02eqwWVfAYy1TuAo/xvJB8tt+0=";
}; };
buildInputs = [ ruby ]; buildInputs = [ ruby ];

4
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -3,13 +3,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gitlab-workhorse"; pname = "gitlab-workhorse";
version = "8.58.2"; version = "8.59.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-workhorse"; repo = "gitlab-workhorse";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ks8rla6hm618dxhr41x1ckzk3jxv0f7vl2547f7f1fl3zqna1zp"; sha256 = "sha256-6JVt5hNWvnUm64SFqns1f1+xMP/KyPQ8H93jqXNT8n8=";
}; };
vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5"; vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5";

53
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View File

@ -4,9 +4,6 @@ gem 'rails', '~> 6.0.3.1'
gem 'bootsnap', '~> 1.4.6' gem 'bootsnap', '~> 1.4.6'
# Improves copy-on-write performance for MRI
gem 'nakayoshi_fork', '~> 0.0.4'
# Responders respond_to and respond_with # Responders respond_to and respond_with
gem 'responders', '~> 3.0' gem 'responders', '~> 3.0'
@ -19,10 +16,10 @@ gem 'default_value_for', '~> 3.3.0'
gem 'pg', '~> 1.1' gem 'pg', '~> 1.1'
gem 'rugged', '~> 0.28' gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.5' gem 'grape-path-helpers', '~> 1.6.1'
gem 'faraday', '~> 1.0' gem 'faraday', '~> 1.0'
gem 'marginalia', '~> 1.9.0' gem 'marginalia', '~> 1.10.0'
# Authentication libraries # Authentication libraries
gem 'devise', '~> 4.7.2' gem 'devise', '~> 4.7.2'
@ -57,7 +54,7 @@ gem 'gssapi', group: :kerberos
# Spam and anti-bot protection # Spam and anti-bot protection
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 3.0' gem 'akismet', '~> 3.0'
gem 'invisible_captcha', '~> 0.12.1' gem 'invisible_captcha', '~> 1.1.0'
# Two-factor authentication # Two-factor authentication
gem 'devise-two-factor', '~> 3.1.0' gem 'devise-two-factor', '~> 3.1.0'
@ -81,12 +78,10 @@ gem 'gpgme', '~> 2.0.19'
# GitLab fork with several improvements to original library. For full list of changes # GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap' gem 'net-ldap', '~> 0.16.3'
# API # API
# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged gem 'grape', '~> 1.5.1'
# Remove config/initializers/grape_patch.rb
gem 'grape', '= 1.4.0'
gem 'grape-entity', '~> 0.7.1' gem 'grape-entity', '~> 0.7.1'
gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
@ -115,7 +110,7 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick', '~> 4.10.1' gem 'mini_magick', '~> 4.10.1'
# for backups # for backups
gem 'fog-aws', '~> 3.7' gem 'fog-aws', '~> 3.8'
# 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'
@ -145,7 +140,7 @@ gem 'aws-sdk-s3', '~> 1'
gem 'faraday_middleware-aws-sigv4', '~>0.3.0' gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.12' gem 'html-pipeline', '~> 2.13.2'
gem 'deckar01-task_list', '2.3.1' gem 'deckar01-task_list', '2.3.1'
gem 'gitlab-markup', '~> 1.7.1' gem 'gitlab-markup', '~> 1.7.1'
gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'github-markup', '~> 1.7.0', require: 'github/markup'
@ -163,7 +158,7 @@ gem 'asciidoctor-kroki', '~> 0.2.2', require: false
gem 'rouge', '~> 3.26.0' gem 'rouge', '~> 3.26.0'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0' gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.10.9' gem 'nokogiri', '~> 1.11.1'
gem 'escape_utils', '~> 1.1' gem 'escape_utils', '~> 1.1'
# Calendar rendering # Calendar rendering
@ -184,15 +179,15 @@ group :unicorn do
end end
group :puma do group :puma do
gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false gem 'puma', '~> 5.1.1', require: false
gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false
end end
# State machine # State machine
gem 'state_machines-activerecord', '~> 0.6.0' gem 'state_machines-activerecord', '~> 0.8.0'
# Issue tags # Issue tags
gem 'acts-as-taggable-on', '~> 6.0' gem 'acts-as-taggable-on', '~> 7.0'
# Background jobs # Background jobs
gem 'sidekiq', '~> 5.2.7' gem 'sidekiq', '~> 5.2.7'
@ -242,7 +237,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
gem 'hipchat', '~> 1.5.0' gem 'hipchat', '~> 1.5.0'
# Jira integration # Jira integration
gem 'jira-ruby', '~> 2.0.0' gem 'jira-ruby', '~> 2.1.4'
gem 'atlassian-jwt', '~> 0.2.0' gem 'atlassian-jwt', '~> 0.2.0'
# Flowdock integration # Flowdock integration
@ -255,7 +250,7 @@ gem 'slack-messenger', '~> 2.3.4'
gem 'hangouts-chat', '~> 0.0.5' gem 'hangouts-chat', '~> 0.0.5'
# Asana integration # Asana integration
gem 'asana', '0.10.2' gem 'asana', '~> 0.10.3'
# FogBugz integration # FogBugz integration
gem 'ruby-fogbugz', '~> 0.2.1' gem 'ruby-fogbugz', '~> 0.2.1'
@ -306,12 +301,12 @@ gem 'rack-attack', '~> 6.3.0'
gem 'sentry-raven', '~> 3.0' gem 'sentry-raven', '~> 3.0'
# PostgreSQL query parsing # PostgreSQL query parsing
gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query' 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.13.3' gem 'gitlab-labkit', '0.14.0'
# I18n # I18n
gem 'ruby_parser', '~> 3.15', require: false gem 'ruby_parser', '~> 3.15', require: false
@ -331,6 +326,7 @@ gem 'snowplow-tracker', '~> 0.6.1'
# Metrics # Metrics
group :metrics do group :metrics do
gem 'method_source', '~> 1.0', require: false gem 'method_source', '~> 1.0', require: false
gem 'webrick', '~> 1.6.1', require: false
# Prometheus # Prometheus
gem 'prometheus-client-mmap', '~> 0.12.0' gem 'prometheus-client-mmap', '~> 0.12.0'
@ -353,14 +349,15 @@ end
group :development, :test do group :development, :test do
gem 'deprecation_toolkit', '~> 1.5.1', require: false gem 'deprecation_toolkit', '~> 1.5.1', require: false
gem 'bullet', '~> 6.1.0' gem 'bullet', '~> 6.1.0'
gem 'pry-byebug', '~> 3.9.0', platform: :mri gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext']
gem 'pry-rails', '~> 0.3.9' gem 'pry-rails', '~> 0.3.9'
gem 'pry-remote'
gem 'awesome_print', require: false gem 'awesome_print', require: false
gem 'database_cleaner', '~> 1.7.0' gem 'database_cleaner', '~> 1.7.0'
gem 'factory_bot_rails', '~> 5.1.0' gem 'factory_bot_rails', '~> 6.1.0'
gem 'rspec-rails', '~> 4.0.0' gem 'rspec-rails', '~> 4.0.1'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.11.0' gem 'minitest', '~> 5.11.0'
@ -371,7 +368,7 @@ 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', '~> 5.3.0', require: false gem 'gitlab-styles', '~> 6.0.0', require: false
gem 'scss_lint', '~> 0.59.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
@ -409,7 +406,7 @@ group :test do
gem 'rspec_profiling', '~> 0.0.6' gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-parameterized', require: false gem 'rspec-parameterized', require: false
gem 'capybara', '~> 3.33.0' gem 'capybara', '~> 3.34.0'
gem 'capybara-screenshot', '~> 1.0.22' gem 'capybara-screenshot', '~> 1.0.22'
gem 'selenium-webdriver', '~> 3.142' gem 'selenium-webdriver', '~> 3.142'
@ -465,7 +462,7 @@ group :ed25519 do
end end
# Gitaly GRPC protocol definitions # Gitaly GRPC protocol definitions
gem 'gitaly', '~> 13.7.0.pre.rc1' gem 'gitaly', '~> 13.8.0.pre.rc2'
gem 'grpc', '~> 1.30.2' gem 'grpc', '~> 1.30.2'
@ -478,7 +475,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.4' gem 'gitlab-experiment', '~> 0.4.5'
# Structured logging # Structured logging
gem 'lograge', '~> 0.5' gem 'lograge', '~> 0.5'

339
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View File

@ -5,66 +5,66 @@ GEM
abstract_type (0.0.7) abstract_type (0.0.7)
acme-client (2.0.6) acme-client (2.0.6)
faraday (>= 0.17, < 2.0.0) faraday (>= 0.17, < 2.0.0)
actioncable (6.0.3.3) actioncable (6.0.3.4)
actionpack (= 6.0.3.3) actionpack (= 6.0.3.4)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.0.3.3) actionmailbox (6.0.3.4)
actionpack (= 6.0.3.3) actionpack (= 6.0.3.4)
activejob (= 6.0.3.3) activejob (= 6.0.3.4)
activerecord (= 6.0.3.3) activerecord (= 6.0.3.4)
activestorage (= 6.0.3.3) activestorage (= 6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.0.3.3) actionmailer (6.0.3.4)
actionpack (= 6.0.3.3) actionpack (= 6.0.3.4)
actionview (= 6.0.3.3) actionview (= 6.0.3.4)
activejob (= 6.0.3.3) activejob (= 6.0.3.4)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.0.3.3) actionpack (6.0.3.4)
actionview (= 6.0.3.3) actionview (= 6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
rack (~> 2.0, >= 2.0.8) rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.3.3) actiontext (6.0.3.4)
actionpack (= 6.0.3.3) actionpack (= 6.0.3.4)
activerecord (= 6.0.3.3) activerecord (= 6.0.3.4)
activestorage (= 6.0.3.3) activestorage (= 6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.0.3.3) actionview (6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.3.3) activejob (6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.0.3.3) activemodel (6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
activerecord (6.0.3.3) activerecord (6.0.3.4)
activemodel (= 6.0.3.3) activemodel (= 6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
activerecord-explain-analyze (0.1.0) activerecord-explain-analyze (0.1.0)
activerecord (>= 4) activerecord (>= 4)
pg pg
activestorage (6.0.3.3) activestorage (6.0.3.4)
actionpack (= 6.0.3.3) actionpack (= 6.0.3.4)
activejob (= 6.0.3.3) activejob (= 6.0.3.4)
activerecord (= 6.0.3.3) activerecord (= 6.0.3.4)
marcel (~> 0.3.1) marcel (~> 0.3.1)
activesupport (6.0.3.3) activesupport (6.0.3.4)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2) zeitwerk (~> 2.2, >= 2.2.2)
acts-as-taggable-on (6.5.0) acts-as-taggable-on (7.0.0)
activerecord (>= 5.0, < 6.1) activerecord (>= 5.0, < 6.2)
adamantium (0.2.0) adamantium (0.2.0)
ice_nine (~> 0.11.0) ice_nine (~> 0.11.0)
memoizable (~> 0.4.0) memoizable (~> 0.4.0)
@ -76,7 +76,7 @@ GEM
apollo_upload_server (2.0.2) apollo_upload_server (2.0.2)
graphql (>= 1.8) graphql (>= 1.8)
rails (>= 4.2) rails (>= 4.2)
asana (0.10.2) asana (0.10.3)
faraday (~> 1.0) faraday (~> 1.0)
faraday_middleware (~> 1.0) faraday_middleware (~> 1.0)
faraday_middleware-multi_json (~> 0.0) faraday_middleware-multi_json (~> 0.0)
@ -115,13 +115,14 @@ GEM
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.1) aws-sigv4 (1.2.1)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
azure-storage-blob (2.0.0) azure-storage-blob (2.0.1)
azure-storage-common (~> 2.0) azure-storage-common (~> 2.0)
nokogiri (~> 1.10.4) nokogiri (~> 1.11.0.rc2)
azure-storage-common (2.0.1) azure-storage-common (2.0.2)
faraday (~> 1.0) faraday (~> 1.0)
faraday_middleware (~> 1.0.0.rc1) faraday_middleware (~> 1.0.0.rc1)
nokogiri (~> 1.10.4) net-http-persistent (~> 4.0)
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 (1.4.0)
@ -151,7 +152,7 @@ GEM
bundler (>= 1.2.0, < 3) bundler (>= 1.2.0, < 3)
thor (~> 0.18) thor (~> 0.18)
byebug (11.1.3) byebug (11.1.3)
capybara (3.33.0) capybara (3.34.0)
addressable addressable
mini_mime (>= 0.1.3) mini_mime (>= 0.1.3)
nokogiri (~> 1.8) nokogiri (~> 1.8)
@ -228,17 +229,16 @@ GEM
activerecord (>= 3.2.0, < 6.1) activerecord (>= 3.2.0, < 6.1)
deprecation_toolkit (1.5.1) deprecation_toolkit (1.5.1)
activesupport (>= 4.2) activesupport (>= 4.2)
derailed_benchmarks (1.7.0) derailed_benchmarks (1.8.1)
benchmark-ips (~> 2) benchmark-ips (~> 2)
get_process_mem (~> 0) get_process_mem (~> 0)
heapy (~> 0) heapy (~> 0)
memory_profiler (~> 0) memory_profiler (~> 0)
mini_histogram (~> 0) mini_histogram (>= 0.2.1)
rack (>= 1) rack (>= 1)
rake (> 10, < 14) rake (> 10, < 14)
ruby-statistics (>= 2.1) ruby-statistics (>= 2.1)
thor (>= 0.19, < 2) thor (>= 0.19, < 2)
unicode_plot (>= 0.0.4, < 1.0.0)
device_detector (1.0.0) device_detector (1.0.0)
devise (4.7.3) devise (4.7.3)
bcrypt (~> 3.0) bcrypt (~> 3.0)
@ -252,7 +252,7 @@ GEM
devise (~> 4.0) devise (~> 4.0)
railties (< 6.1) railties (< 6.1)
rotp (~> 2.0) rotp (~> 2.0)
diff-lcs (1.3) 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-blackst0ne (3.3.0)
@ -265,21 +265,19 @@ GEM
doorkeeper-openid_connect (1.7.4) doorkeeper-openid_connect (1.7.4)
doorkeeper (>= 5.2, < 5.5) doorkeeper (>= 5.2, < 5.5)
json-jwt (>= 1.11.0) json-jwt (>= 1.11.0)
dry-configurable (0.11.5) dry-configurable (0.12.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
dry-core (~> 0.4, >= 0.4.7) dry-core (~> 0.5, >= 0.5.0)
dry-equalizer (~> 0.2)
dry-container (0.7.2) dry-container (0.7.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
dry-configurable (~> 0.1, >= 0.1.3) dry-configurable (~> 0.1, >= 0.1.3)
dry-core (0.4.9) dry-core (0.5.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
dry-equalizer (0.3.0) dry-equalizer (0.3.0)
dry-inflector (0.2.0) dry-inflector (0.2.0)
dry-logic (1.0.6) dry-logic (1.1.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
dry-core (~> 0.2) dry-core (~> 0.5, >= 0.5)
dry-equalizer (~> 0.2)
dry-types (1.4.0) dry-types (1.4.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
dry-container (~> 0.3) dry-container (~> 0.3)
@ -309,7 +307,6 @@ GEM
launchy (~> 2.1) launchy (~> 2.1)
mail (~> 2.7) mail (~> 2.7)
encryptor (3.0.0) encryptor (3.0.0)
enumerable-statistics (2.0.1)
equalizer (0.0.11) equalizer (0.0.11)
erubi (1.9.0) erubi (1.9.0)
escape_utils (1.2.1) escape_utils (1.2.1)
@ -321,11 +318,11 @@ GEM
expression_parser (0.9.0) expression_parser (0.9.0)
extended-markdown-filter (0.6.0) extended-markdown-filter (0.6.0)
html-pipeline (~> 2.0) html-pipeline (~> 2.0)
factory_bot (5.1.0) factory_bot (6.1.0)
activesupport (>= 4.2.0) activesupport (>= 5.0.0)
factory_bot_rails (5.1.0) factory_bot_rails (6.1.0)
factory_bot (~> 5.1.0) factory_bot (~> 6.1.0)
railties (>= 4.2.0) railties (>= 5.0.0)
faraday (1.0.1) faraday (1.0.1)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.7) faraday-cookie_jar (0.0.7)
@ -363,7 +360,7 @@ GEM
fog-json fog-json
ipaddress (~> 0.8) ipaddress (~> 0.8)
xml-simple (~> 1.1) xml-simple (~> 1.1)
fog-aws (3.7.0) fog-aws (3.8.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)
@ -420,12 +417,12 @@ GEM
rails (>= 3.2.0) rails (>= 3.2.0)
git (1.7.0) git (1.7.0)
rchardet (~> 1.8) rchardet (~> 1.8)
gitaly (13.7.0.pre.rc1) gitaly (13.8.0.pre.rc2)
grpc (~> 1.0) grpc (~> 1.0)
github-markup (1.7.0) github-markup (1.7.0)
gitlab-chronic (0.10.5) gitlab-chronic (0.10.5)
numerizer (~> 0.2) numerizer (~> 0.2)
gitlab-experiment (0.4.4) gitlab-experiment (0.4.5)
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.0)
@ -435,9 +432,9 @@ GEM
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.13.3) gitlab-labkit (0.14.0)
actionpack (>= 5.0.0, < 6.1.0) actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 7.0.0)
gitlab-pg_query (~> 1.3) gitlab-pg_query (~> 1.3)
grpc (~> 1.19) grpc (~> 1.19)
jaeger-client (~> 1.1) jaeger-client (~> 1.1)
@ -447,19 +444,17 @@ GEM
gitlab-mail_room (0.0.8) gitlab-mail_room (0.0.8)
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.0) gitlab-pg_query (1.3.1)
gitlab-puma (4.3.5.gitlab.3) gitlab-pry-byebug (3.9.0)
nio4r (~> 2.0) byebug (~> 11.0)
gitlab-puma_worker_killer (0.1.1.gitlab.1) pry (~> 0.13.0)
get_process_mem (~> 0.2)
gitlab-puma (>= 2.7, < 5)
gitlab-sidekiq-fetcher (0.5.2) gitlab-sidekiq-fetcher (0.5.2)
sidekiq (~> 5) sidekiq (~> 5)
gitlab-styles (5.3.0) gitlab-styles (6.0.0)
rubocop (~> 0.89.1) rubocop (~> 0.91.1)
rubocop-gitlab-security (~> 0.1.0) rubocop-gitlab-security (~> 0.1.1)
rubocop-performance (~> 1.8.1) rubocop-performance (~> 1.9.2)
rubocop-rails (~> 2.8) rubocop-rails (~> 2.9)
rubocop-rspec (~> 1.44) rubocop-rspec (~> 1.44)
gitlab_chronic_duration (0.10.6.2) gitlab_chronic_duration (0.10.6.2)
numerizer (~> 0.2) numerizer (~> 0.2)
@ -497,7 +492,7 @@ GEM
signet (~> 0.14) signet (~> 0.14)
gpgme (2.0.20) gpgme (2.0.20)
mini_portile2 (~> 2.3) mini_portile2 (~> 2.3)
grape (1.4.0) grape (1.5.1)
activesupport activesupport
builder builder
dry-types (>= 1.1) dry-types (>= 1.1)
@ -507,10 +502,11 @@ GEM
grape-entity (0.7.1) grape-entity (0.7.1)
activesupport (>= 4.0) activesupport (>= 4.0)
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
grape-path-helpers (1.5.0) grape-path-helpers (1.6.1)
activesupport activesupport
grape (~> 1.3) grape (~> 1.3)
rake (> 12) rake (> 12)
ruby2_keywords (~> 0.0.2)
grape_logging (1.8.3) grape_logging (1.8.3)
grape grape
rack rack
@ -573,11 +569,12 @@ GEM
hashie (>= 3.0) hashie (>= 3.0)
health_check (3.0.0) health_check (3.0.0)
railties (>= 5.0) railties (>= 5.0)
heapy (0.1.4) heapy (0.2.0)
thor
hipchat (1.5.2) hipchat (1.5.2)
httparty httparty
mimemagic mimemagic
html-pipeline (2.12.2) html-pipeline (2.13.2)
activesupport (>= 2) activesupport (>= 2)
nokogiri (>= 1.4) nokogiri (>= 1.4)
html2text (0.2.0) html2text (0.2.0)
@ -598,18 +595,18 @@ 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.5) i18n (1.8.7)
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)
ice_nine (0.11.2) ice_nine (0.11.2)
invisible_captcha (0.12.1) invisible_captcha (1.1.0)
rails (>= 3.2.0) rails (>= 4.2)
ipaddress (0.8.3) ipaddress (0.8.3)
jaeger-client (1.1.0) jaeger-client (1.1.0)
opentracing (~> 0.3) opentracing (~> 0.3)
thrift thrift
jira-ruby (2.0.0) jira-ruby (2.1.4)
activesupport activesupport
atlassian-jwt atlassian-jwt
multipart-post multipart-post
@ -686,7 +683,7 @@ GEM
activesupport (>= 4) activesupport (>= 4)
railties (>= 4) railties (>= 4)
request_store (~> 1.0) request_store (~> 1.0)
loofah (2.7.0) loofah (2.8.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
lru_redux (1.1.0) lru_redux (1.1.0)
@ -695,7 +692,7 @@ GEM
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
marcel (0.3.3) marcel (0.3.3)
mimemagic (~> 0.3.2) mimemagic (~> 0.3.2)
marginalia (1.9.0) marginalia (1.10.0)
actionpack (>= 2.3) actionpack (>= 2.3)
activerecord (>= 2.3) activerecord (>= 2.3)
memoist (0.16.2) memoist (0.16.2)
@ -707,10 +704,10 @@ GEM
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.5)
mini_histogram (0.1.3) 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.4.0) mini_portile2 (2.5.0)
minitest (5.11.3) minitest (5.11.3)
ms_rest (0.7.6) ms_rest (0.7.6)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
@ -730,17 +727,19 @@ GEM
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
mustermann-grape (1.0.1) mustermann-grape (1.0.1)
mustermann (>= 1.0.0) mustermann (>= 1.0.0)
nakayoshi_fork (0.0.4)
nap (1.1.0) nap (1.1.0)
nenv (0.3.0) nenv (0.3.0)
net-ldap (0.16.2) net-http-persistent (4.0.0)
connection_pool (~> 2.2)
net-ldap (0.16.3)
net-ntp (2.1.3) net-ntp (2.1.3)
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)
no_proxy_fix (0.1.2) no_proxy_fix (0.1.2)
nokogiri (1.10.10) nokogiri (1.11.1)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (2.0.2) nokogumbo (2.0.2)
nokogiri (~> 1.8, >= 1.8.4) nokogiri (~> 1.8, >= 1.8.4)
notiffany (0.1.3) notiffany (0.1.3)
@ -840,13 +839,14 @@ GEM
rubypants (~> 0.2) rubypants (~> 0.2)
orm_adapter (0.5.0) orm_adapter (0.5.0)
os (1.1.1) os (1.1.1)
parallel (1.19.2) parallel (1.20.1)
parser (2.7.2.0) parser (3.0.0.0)
ast (~> 2.4.1) ast (~> 2.4.1)
parslet (1.8.2) parslet (1.8.2)
peek (1.1.0) peek (1.1.0)
railties (>= 4.0.0) railties (>= 4.0.0)
pg (1.2.3) pg (1.2.3)
pg_query (1.3.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)
@ -866,14 +866,20 @@ GEM
pry (0.13.1) pry (0.13.1)
coderay (~> 1.1) coderay (~> 1.1)
method_source (~> 1.0) method_source (~> 1.0)
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
pry-rails (0.3.9) pry-rails (0.3.9)
pry (>= 0.10.4) pry (>= 0.10.4)
pry-remote (0.1.8)
pry (~> 0.9)
slop (~> 3.0)
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.1.1)
nio4r (~> 2.0)
puma_worker_killer (0.3.1)
get_process_mem (~> 0.2)
puma (>= 2.7)
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
raabro (1.1.6) raabro (1.1.6)
racc (1.5.2)
rack (2.2.3) rack (2.2.3)
rack-accept (0.4.5) rack-accept (0.4.5)
rack (>= 0.4) rack (>= 0.4)
@ -894,20 +900,20 @@ GEM
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rack-timeout (0.5.2) rack-timeout (0.5.2)
rails (6.0.3.3) rails (6.0.3.4)
actioncable (= 6.0.3.3) actioncable (= 6.0.3.4)
actionmailbox (= 6.0.3.3) actionmailbox (= 6.0.3.4)
actionmailer (= 6.0.3.3) actionmailer (= 6.0.3.4)
actionpack (= 6.0.3.3) actionpack (= 6.0.3.4)
actiontext (= 6.0.3.3) actiontext (= 6.0.3.4)
actionview (= 6.0.3.3) actionview (= 6.0.3.4)
activejob (= 6.0.3.3) activejob (= 6.0.3.4)
activemodel (= 6.0.3.3) activemodel (= 6.0.3.4)
activerecord (= 6.0.3.3) activerecord (= 6.0.3.4)
activestorage (= 6.0.3.3) activestorage (= 6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 6.0.3.3) railties (= 6.0.3.4)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5) rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1) actionpack (>= 5.0.1.rc1)
@ -921,15 +927,15 @@ GEM
rails-i18n (6.0.0) rails-i18n (6.0.0)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7) railties (>= 6.0.0, < 7)
railties (6.0.3.3) railties (6.0.3.4)
actionpack (= 6.0.3.3) actionpack (= 6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0) thor (>= 0.20.3, < 2.0)
rainbow (3.0.0) rainbow (3.0.0)
raindrops (0.19.1) raindrops (0.19.1)
rake (13.0.1) rake (13.0.3)
rb-fsevent (0.10.4) rb-fsevent (0.10.4)
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
@ -989,25 +995,25 @@ GEM
chunky_png chunky_png
rqrcode-rails3 (0.1.7) rqrcode-rails3 (0.1.7)
rqrcode (>= 0.4.2) rqrcode (>= 0.4.2)
rspec (3.9.0) rspec (3.10.0)
rspec-core (~> 3.9.0) rspec-core (~> 3.10.0)
rspec-expectations (~> 3.9.0) rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.9.0) rspec-mocks (~> 3.10.0)
rspec-core (3.9.1) rspec-core (3.10.0)
rspec-support (~> 3.9.1) rspec-support (~> 3.10.0)
rspec-expectations (3.9.1) rspec-expectations (3.10.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0) rspec-support (~> 3.10.0)
rspec-mocks (3.9.1) rspec-mocks (3.10.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0) rspec-support (~> 3.10.0)
rspec-parameterized (0.4.2) rspec-parameterized (0.4.2)
binding_ninja (>= 0.2.3) binding_ninja (>= 0.2.3)
parser parser
proc_to_ast proc_to_ast
rspec (>= 2.13, < 4) rspec (>= 2.13, < 4)
unparser unparser
rspec-rails (4.0.0) rspec-rails (4.0.1)
actionpack (>= 4.2) actionpack (>= 4.2)
activesupport (>= 4.2) activesupport (>= 4.2)
railties (>= 4.2) railties (>= 4.2)
@ -1017,7 +1023,7 @@ GEM
rspec-support (~> 3.9) rspec-support (~> 3.9)
rspec-retry (0.6.1) rspec-retry (0.6.1)
rspec-core (> 3.3) rspec-core (> 3.3)
rspec-support (3.9.2) rspec-support (3.10.0)
rspec_junit_formatter (0.4.1) rspec_junit_formatter (0.4.1)
rspec-core (>= 2, < 4, != 2.12.0) rspec-core (>= 2, < 4, != 2.12.0)
rspec_profiling (0.0.6) rspec_profiling (0.0.6)
@ -1025,26 +1031,26 @@ GEM
pg pg
rails rails
sqlite3 sqlite3
rubocop (0.89.1) rubocop (0.91.1)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.7.1.1) parser (>= 2.7.1.1)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7) regexp_parser (>= 1.7)
rexml rexml
rubocop-ast (>= 0.3.0, < 1.0) rubocop-ast (>= 0.4.0, < 1.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 (0.8.0)
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)
rubocop-performance (1.8.1) rubocop-performance (1.9.2)
rubocop (>= 0.87.0) rubocop (>= 0.90.0, < 2.0)
rubocop-ast (>= 0.4.0) rubocop-ast (>= 0.4.0)
rubocop-rails (2.8.1) rubocop-rails (2.9.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
rack (>= 1.1) rack (>= 1.1)
rubocop (>= 0.87.0) rubocop (>= 0.90.0, < 2.0)
rubocop-rspec (1.44.1) rubocop-rspec (1.44.1)
rubocop (~> 0.87) rubocop (~> 0.87)
rubocop-ast (>= 0.7.1) rubocop-ast (>= 0.7.1)
@ -1053,7 +1059,7 @@ GEM
ruby-fogbugz (0.2.1) ruby-fogbugz (0.2.1)
crack (~> 0.4) crack (~> 0.4)
ruby-prof (1.3.1) ruby-prof (1.3.1)
ruby-progressbar (1.10.1) ruby-progressbar (1.11.0)
ruby-saml (1.7.2) ruby-saml (1.7.2)
nokogiri (>= 1.5.10) nokogiri (>= 1.5.10)
ruby-statistics (2.1.2) ruby-statistics (2.1.2)
@ -1127,6 +1133,7 @@ GEM
simplecov-html (0.12.2) simplecov-html (0.12.2)
sixarm_ruby_unaccent (1.2.0) sixarm_ruby_unaccent (1.2.0)
slack-messenger (2.3.4) slack-messenger (2.3.4)
slop (3.6.0)
snowplow-tracker (0.6.1) snowplow-tracker (0.6.1)
contracts (~> 0.7, <= 0.11) contracts (~> 0.7, <= 0.11)
spring (2.1.1) spring (2.1.1)
@ -1143,12 +1150,12 @@ GEM
sshkey (2.0.0) sshkey (2.0.0)
stackprof (0.2.15) stackprof (0.2.15)
state_machines (0.5.0) state_machines (0.5.0)
state_machines-activemodel (0.7.1) state_machines-activemodel (0.8.0)
activemodel (>= 4.1) activemodel (>= 5.1)
state_machines (>= 0.5.0) state_machines (>= 0.5.0)
state_machines-activerecord (0.6.0) state_machines-activerecord (0.8.0)
activerecord (>= 4.1) activerecord (>= 5.1)
state_machines-activemodel (>= 0.5.0) state_machines-activemodel (>= 0.8.0)
swd (1.1.2) swd (1.1.2)
activesupport (>= 3) activesupport (>= 3)
attr_required (>= 0.0.5) attr_required (>= 0.0.5)
@ -1185,7 +1192,7 @@ GEM
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)
tzinfo (1.2.8) tzinfo (1.2.9)
thread_safe (~> 0.1) thread_safe (~> 0.1)
u2f (0.2.1) u2f (0.2.1)
uber (0.1.0) uber (0.1.0)
@ -1193,8 +1200,6 @@ GEM
unf_ext unf_ext
unf_ext (0.0.7.7) unf_ext (0.0.7.7)
unicode-display_width (1.7.0) unicode-display_width (1.7.0)
unicode_plot (0.0.4)
enumerable-statistics (>= 2.0.1)
unicode_utils (1.4.0) unicode_utils (1.4.0)
unicorn (5.5.5) unicorn (5.5.5)
kgio (~> 2.6) kgio (~> 2.6)
@ -1247,6 +1252,7 @@ GEM
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0) hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.6.1)
websocket-driver (0.7.3) websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5) websocket-extensions (0.1.5)
@ -1259,7 +1265,7 @@ GEM
xpath (3.2.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
yajl-ruby (1.4.1) yajl-ruby (1.4.1)
zeitwerk (2.4.1) zeitwerk (2.4.2)
PLATFORMS PLATFORMS
ruby ruby
@ -1268,11 +1274,11 @@ DEPENDENCIES
RedCloth (~> 4.3.2) RedCloth (~> 4.3.2)
acme-client (~> 2.0, >= 2.0.6) acme-client (~> 2.0, >= 2.0.6)
activerecord-explain-analyze (~> 0.1) activerecord-explain-analyze (~> 0.1)
acts-as-taggable-on (~> 6.0) acts-as-taggable-on (~> 7.0)
addressable (~> 2.7) addressable (~> 2.7)
akismet (~> 3.0) akismet (~> 3.0)
apollo_upload_server (~> 2.0.2) apollo_upload_server (~> 2.0.2)
asana (= 0.10.2) asana (~> 0.10.3)
asciidoctor (~> 2.0.10) asciidoctor (~> 2.0.10)
asciidoctor-include-ext (~> 0.3.1) asciidoctor-include-ext (~> 0.3.1)
asciidoctor-kroki (~> 0.2.2) asciidoctor-kroki (~> 0.2.2)
@ -1297,7 +1303,7 @@ DEPENDENCIES
browser (~> 4.2) browser (~> 4.2)
bullet (~> 6.1.0) bullet (~> 6.1.0)
bundler-audit (~> 0.6.1) bundler-audit (~> 0.6.1)
capybara (~> 3.33.0) capybara (~> 3.34.0)
capybara-screenshot (~> 1.0.22) capybara-screenshot (~> 1.0.22)
carrierwave (~> 1.3) carrierwave (~> 1.3)
charlock_holmes (~> 0.7.7) charlock_holmes (~> 0.7.7)
@ -1329,7 +1335,7 @@ DEPENDENCIES
email_spec (~> 2.2.0) email_spec (~> 2.2.0)
erubi (~> 1.9.0) erubi (~> 1.9.0)
escape_utils (~> 1.1) escape_utils (~> 1.1)
factory_bot_rails (~> 5.1.0) factory_bot_rails (~> 6.1.0)
faraday (~> 1.0) faraday (~> 1.0)
faraday_middleware-aws-sigv4 (~> 0.3.0) faraday_middleware-aws-sigv4 (~> 0.3.0)
fast_blank fast_blank
@ -1339,7 +1345,7 @@ 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.7) fog-aws (~> 3.8)
fog-core (= 2.1.0) fog-core (= 2.1.0)
fog-google (~> 1.12) fog-google (~> 1.12)
fog-local (~> 0.6) fog-local (~> 0.6)
@ -1351,30 +1357,28 @@ DEPENDENCIES
gettext (~> 3.3) gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3) gettext_i18n_rails_js (~> 1.3)
gitaly (~> 13.7.0.pre.rc1) gitaly (~> 13.8.0.pre.rc2)
github-markup (~> 1.7.0) github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5) gitlab-chronic (~> 0.10.5)
gitlab-experiment (~> 0.4.4) gitlab-experiment (~> 0.4.5)
gitlab-fog-azure-rm (~> 1.0) gitlab-fog-azure-rm (~> 1.0)
gitlab-labkit (= 0.13.3) gitlab-labkit (= 0.14.0)
gitlab-license (~> 1.0) gitlab-license (~> 1.0)
gitlab-mail_room (~> 0.0.8) gitlab-mail_room (~> 0.0.8)
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) gitlab-pry-byebug
gitlab-puma (~> 4.3.3.gitlab.2)
gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)
gitlab-sidekiq-fetcher (= 0.5.2) gitlab-sidekiq-fetcher (= 0.5.2)
gitlab-styles (~> 5.3.0) gitlab-styles (~> 6.0.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)
google-api-client (~> 0.33) google-api-client (~> 0.33)
google-protobuf (~> 3.12) google-protobuf (~> 3.12)
gpgme (~> 2.0.19) gpgme (~> 2.0.19)
grape (= 1.4.0) grape (~> 1.5.1)
grape-entity (~> 0.7.1) grape-entity (~> 0.7.1)
grape-path-helpers (~> 1.5) grape-path-helpers (~> 1.6.1)
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)
@ -1390,13 +1394,13 @@ DEPENDENCIES
hashie-forbidden_attributes hashie-forbidden_attributes
health_check (~> 3.0) health_check (~> 3.0)
hipchat (~> 1.5.0) hipchat (~> 1.5.0)
html-pipeline (~> 2.12) html-pipeline (~> 2.13.2)
html2text html2text
httparty (~> 0.16.4) httparty (~> 0.16.4)
icalendar icalendar
invisible_captcha (~> 0.12.1) invisible_captcha (~> 1.1.0)
ipaddress (~> 0.8.3) ipaddress (~> 0.8.3)
jira-ruby (~> 2.0.0) jira-ruby (~> 2.1.4)
js_regex (~> 3.4) js_regex (~> 3.4)
json (~> 2.3.0) json (~> 2.3.0)
json-schema (~> 2.8.0) json-schema (~> 2.8.0)
@ -1414,18 +1418,17 @@ DEPENDENCIES
loofah (~> 2.2) loofah (~> 2.2)
lru_redux lru_redux
mail (= 2.7.1) mail (= 2.7.1)
marginalia (~> 1.9.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.2)
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)
nakayoshi_fork (~> 0.0.4) net-ldap (~> 0.16.3)
net-ldap
net-ntp net-ntp
net-ssh (~> 6.0) net-ssh (~> 6.0)
nokogiri (~> 1.10.9) nokogiri (~> 1.11.1)
oauth2 (~> 1.4) oauth2 (~> 1.4)
octokit (~> 4.15) octokit (~> 4.15)
oj (~> 3.10.6) oj (~> 3.10.6)
@ -1451,11 +1454,14 @@ DEPENDENCIES
parallel (~> 1.19) parallel (~> 1.19)
peek (~> 1.1) peek (~> 1.1)
pg (~> 1.1) pg (~> 1.1)
pg_query (~> 1.3.0)
png_quantizator (~> 0.2.1) png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3) premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.12.0) prometheus-client-mmap (~> 0.12.0)
pry-byebug (~> 3.9.0)
pry-rails (~> 0.3.9) pry-rails (~> 0.3.9)
pry-remote
puma (~> 5.1.1)
puma_worker_killer (~> 0.3.1)
rack (~> 2.2.3) rack (~> 2.2.3)
rack-attack (~> 6.3.0) rack-attack (~> 6.3.0)
rack-cors (~> 1.0.6) rack-cors (~> 1.0.6)
@ -1481,7 +1487,7 @@ DEPENDENCIES
rouge (~> 3.26.0) rouge (~> 3.26.0)
rqrcode-rails3 (~> 0.1.7) rqrcode-rails3 (~> 0.1.7)
rspec-parameterized rspec-parameterized
rspec-rails (~> 4.0.0) rspec-rails (~> 4.0.1)
rspec-retry (~> 0.6.1) rspec-retry (~> 0.6.1)
rspec_junit_formatter rspec_junit_formatter
rspec_profiling (~> 0.0.6) rspec_profiling (~> 0.0.6)
@ -1511,7 +1517,7 @@ DEPENDENCIES
sprockets (~> 3.7.0) sprockets (~> 3.7.0)
sshkey (~> 2.0) sshkey (~> 2.0)
stackprof (~> 0.2.15) stackprof (~> 0.2.15)
state_machines-activerecord (~> 0.6.0) state_machines-activerecord (~> 0.8.0)
sys-filesystem (~> 1.1.6) sys-filesystem (~> 1.1.6)
terser (= 1.0.2) terser (= 1.0.2)
test-prof (~> 0.12.0) test-prof (~> 0.12.0)
@ -1530,6 +1536,7 @@ DEPENDENCIES
vmstat (~> 2.3.0) vmstat (~> 2.3.0)
webauthn (~> 2.3) webauthn (~> 2.3)
webmock (~> 3.9.1) webmock (~> 3.9.1)
webrick (~> 1.6.1)
wikicloth (= 0.8.1) wikicloth (= 0.8.1)
yajl-ruby (~> 1.4.1) yajl-ruby (~> 1.4.1)

420
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View File

File diff suppressed because it is too large Load Diff

216
pkgs/applications/version-management/gitlab/yarnPkgs.nix
View File

@ -778,19 +778,27 @@
}; };
} }
{ {
name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz"; name = "_gitlab_eslint_plugin___eslint_plugin_6.0.0.tgz";
path = fetchurl { path = fetchurl {
name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz"; name = "_gitlab_eslint_plugin___eslint_plugin_6.0.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-5.0.0.tgz"; url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-6.0.0.tgz";
sha1 = "502eb2bccb55d65d6310ce9ef2da76035b6fc319"; sha1 = "deb18f63808af1cb1cc117a92558f07edb1e2256";
}; };
} }
{ {
name = "_gitlab_svgs___svgs_1.177.0.tgz"; name = "_gitlab_favicon_overlay___favicon_overlay_2.0.0.tgz";
path = fetchurl { path = fetchurl {
name = "_gitlab_svgs___svgs_1.177.0.tgz"; name = "_gitlab_favicon_overlay___favicon_overlay_2.0.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.177.0.tgz"; url = "https://registry.yarnpkg.com/@gitlab/favicon-overlay/-/favicon-overlay-2.0.0.tgz";
sha1 = "e481ed327a11d3834c8b1668d7485b9eefef97f5"; sha1 = "2f32d0b6a4d5b8ac44e2927083d9ab478a78c984";
};
}
{
name = "_gitlab_svgs___svgs_1.178.0.tgz";
path = fetchurl {
name = "_gitlab_svgs___svgs_1.178.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.178.0.tgz";
sha1 = "069edb8abb4c7137d48f527592476655f066538b";
}; };
} }
{ {
@ -802,11 +810,11 @@
}; };
} }
{ {
name = "_gitlab_ui___ui_24.8.1.tgz"; name = "_gitlab_ui___ui_25.11.3.tgz";
path = fetchurl { path = fetchurl {
name = "_gitlab_ui___ui_24.8.1.tgz"; name = "_gitlab_ui___ui_25.11.3.tgz";
url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-24.8.1.tgz"; url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-25.11.3.tgz";
sha1 = "eb674d19aedf9c91b9a14aa7a66397d54b199fb7"; sha1 = "54719d1276f417e66904f9f951671633f1647006";
}; };
} }
{ {
@ -970,19 +978,19 @@
}; };
} }
{ {
name = "_rails_actioncable___actioncable_6.0.3_3.tgz"; name = "_rails_actioncable___actioncable_6.1.0.tgz";
path = fetchurl { path = fetchurl {
name = "_rails_actioncable___actioncable_6.0.3_3.tgz"; name = "_rails_actioncable___actioncable_6.1.0.tgz";
url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3-3.tgz"; url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.0.tgz";
sha1 = "fb1a46d3d353512764d5fa3cea2f492391601b7a"; sha1 = "f336f25450b1bc43b99bc60557a70b6e6bb1d3d2";
}; };
} }
{ {
name = "_rails_ujs___ujs_6.0.3_2.tgz"; name = "_rails_ujs___ujs_6.1.0.tgz";
path = fetchurl { path = fetchurl {
name = "_rails_ujs___ujs_6.0.3_2.tgz"; name = "_rails_ujs___ujs_6.1.0.tgz";
url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.3-2.tgz"; url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.0.tgz";
sha1 = "e14c1f29086858215ce7ccd9ad6d8888c458b4a3"; sha1 = "9a48df6511cb2b472c9f596c1f37dc0af022e751";
}; };
} }
{ {
@ -1178,11 +1186,11 @@
}; };
} }
{ {
name = "_types_json_schema___json_schema_7.0.4.tgz"; name = "_types_json_schema___json_schema_7.0.6.tgz";
path = fetchurl { path = fetchurl {
name = "_types_json_schema___json_schema_7.0.4.tgz"; name = "_types_json_schema___json_schema_7.0.6.tgz";
url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz"; url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz";
sha1 = "38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"; sha1 = "f4c7ec43e81b319a9815115031709f26987891f0";
}; };
} }
{ {
@ -1314,11 +1322,11 @@
}; };
} }
{ {
name = "_vue_test_utils___test_utils_1.0.0_beta.30.tgz"; name = "_vue_test_utils___test_utils_1.1.2.tgz";
path = fetchurl { path = fetchurl {
name = "_vue_test_utils___test_utils_1.0.0_beta.30.tgz"; name = "_vue_test_utils___test_utils_1.1.2.tgz";
url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.30.tgz"; url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.1.2.tgz";
sha1 = "d5f26d1e2411fdb7fa7fdedb61b4b4ea4194c49d"; sha1 = "fdb487448dceefeaf3d01d465f7c836a3d666dbc";
}; };
} }
{ {
@ -1538,11 +1546,11 @@
}; };
} }
{ {
name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; name = "acorn_jsx___acorn_jsx_5.3.1.tgz";
path = fetchurl { path = fetchurl {
name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; name = "acorn_jsx___acorn_jsx_5.3.1.tgz";
url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz"; url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz";
sha1 = "294adb71b57398b0680015f0a38c563ee1db5384"; sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b";
}; };
} }
{ {
@ -1610,19 +1618,19 @@
}; };
} }
{ {
name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; name = "ajv_keywords___ajv_keywords_3.5.2.tgz";
path = fetchurl { path = fetchurl {
name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; name = "ajv_keywords___ajv_keywords_3.5.2.tgz";
url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz";
sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da"; sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d";
}; };
} }
{ {
name = "ajv___ajv_6.12.5.tgz"; name = "ajv___ajv_6.12.6.tgz";
path = fetchurl { path = fetchurl {
name = "ajv___ajv_6.12.5.tgz"; name = "ajv___ajv_6.12.6.tgz";
url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz";
sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da"; sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4";
}; };
} }
{ {
@ -4402,11 +4410,11 @@
}; };
} }
{ {
name = "dompurify___dompurify_2.2.4.tgz"; name = "dompurify___dompurify_2.2.6.tgz";
path = fetchurl { path = fetchurl {
name = "dompurify___dompurify_2.2.4.tgz"; name = "dompurify___dompurify_2.2.6.tgz";
url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.4.tgz"; url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.6.tgz";
sha1 = "a98cd182b729bdd8715c3eb7a8bf8eafb2ff7410"; sha1 = "54945dc5c0b45ce5ae228705777e8e59d7b2edc4";
}; };
} }
{ {
@ -4874,11 +4882,11 @@
}; };
} }
{ {
name = "eslint_plugin_vue___eslint_plugin_vue_6.2.2.tgz"; name = "eslint_plugin_vue___eslint_plugin_vue_7.4.1.tgz";
path = fetchurl { path = fetchurl {
name = "eslint_plugin_vue___eslint_plugin_vue_6.2.2.tgz"; name = "eslint_plugin_vue___eslint_plugin_vue_7.4.1.tgz";
url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz";
sha1 = "27fecd9a3a24789b0f111ecdd540a9e56198e0fe"; sha1 = "2526ef0c010c218824a89423dbe6ddbe76f04fd6";
}; };
} }
{ {
@ -4914,11 +4922,11 @@
}; };
} }
{ {
name = "eslint_utils___eslint_utils_2.0.0.tgz"; name = "eslint_utils___eslint_utils_2.1.0.tgz";
path = fetchurl { path = fetchurl {
name = "eslint_utils___eslint_utils_2.0.0.tgz"; name = "eslint_utils___eslint_utils_2.1.0.tgz";
url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz"; url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz";
sha1 = "7be1cc70f27a72a76cd14aa698bcabed6890e1cd"; sha1 = "d2de5e03424e707dc10c74068ddedae708741b27";
}; };
} }
{ {
@ -4938,11 +4946,11 @@
}; };
} }
{ {
name = "espree___espree_6.1.2.tgz"; name = "espree___espree_6.2.1.tgz";
path = fetchurl { path = fetchurl {
name = "espree___espree_6.1.2.tgz"; name = "espree___espree_6.2.1.tgz";
url = "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz"; url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz";
sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d"; sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a";
}; };
} }
{ {
@ -5225,6 +5233,14 @@
sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
}; };
} }
{
name = "fast_mersenne_twister___fast_mersenne_twister_1.0.2.tgz";
path = fetchurl {
name = "fast_mersenne_twister___fast_mersenne_twister_1.0.2.tgz";
url = "https://registry.yarnpkg.com/fast-mersenne-twister/-/fast-mersenne-twister-1.0.2.tgz";
sha1 = "5ead7caf3ace592a5789d11767732bd81cbaaa56";
};
}
{ {
name = "fault___fault_1.0.2.tgz"; name = "fault___fault_1.0.2.tgz";
path = fetchurl { path = fetchurl {
@ -7874,11 +7890,11 @@
}; };
} }
{ {
name = "katex___katex_0.10.0.tgz"; name = "katex___katex_0.10.2.tgz";
path = fetchurl { path = fetchurl {
name = "katex___katex_0.10.0.tgz"; name = "katex___katex_0.10.2.tgz";
url = "https://registry.yarnpkg.com/katex/-/katex-0.10.0.tgz"; url = "https://registry.yarnpkg.com/katex/-/katex-0.10.2.tgz";
sha1 = "da562e5d0d5cc3aa602e27af8a9b8710bfbce765"; sha1 = "39973edbb65eda5b6f9e7f41648781e557dd4932";
}; };
} }
{ {
@ -8081,6 +8097,14 @@
sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613";
}; };
} }
{
name = "loader_utils___loader_utils_2.0.0.tgz";
path = fetchurl {
name = "loader_utils___loader_utils_2.0.0.tgz";
url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz";
sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0";
};
}
{ {
name = "locate_path___locate_path_2.0.0.tgz"; name = "locate_path___locate_path_2.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -8593,6 +8617,14 @@
sha1 = "5d47f709c4c9fc3c216b6d46127280f40b39d790"; sha1 = "5d47f709c4c9fc3c216b6d46127280f40b39d790";
}; };
} }
{
name = "mathjax___mathjax_3.1.2.tgz";
path = fetchurl {
name = "mathjax___mathjax_3.1.2.tgz";
url = "https://registry.yarnpkg.com/mathjax/-/mathjax-3.1.2.tgz";
sha1 = "95c0d45ce2330ef7b6a815cebe7d61ecc26bbabd";
};
}
{ {
name = "mathml_tag_names___mathml_tag_names_2.1.1.tgz"; name = "mathml_tag_names___mathml_tag_names_2.1.1.tgz";
path = fetchurl { path = fetchurl {
@ -8721,14 +8753,6 @@
sha1 = "0f1914cda53d4ea5377380e5ce07a38bef2ea7e8"; sha1 = "0f1914cda53d4ea5377380e5ce07a38bef2ea7e8";
}; };
} }
{
name = "mersenne_twister___mersenne_twister_1.1.0.tgz";
path = fetchurl {
name = "mersenne_twister___mersenne_twister_1.1.0.tgz";
url = "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz";
sha1 = "f916618ee43d7179efcf641bec4531eb9670978a";
};
}
{ {
name = "methods___methods_1.1.2.tgz"; name = "methods___methods_1.1.2.tgz";
path = fetchurl { path = fetchurl {
@ -10265,14 +10289,6 @@
sha1 = "a3b4160516007075d29127262f3a0063d19896e9"; sha1 = "a3b4160516007075d29127262f3a0063d19896e9";
}; };
} }
{
name = "prettier___prettier_1.18.2.tgz";
path = fetchurl {
name = "prettier___prettier_1.18.2.tgz";
url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz";
sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea";
};
}
{ {
name = "prettier___prettier_2.0.5.tgz"; name = "prettier___prettier_2.0.5.tgz";
path = fetchurl { path = fetchurl {
@ -10281,6 +10297,22 @@
sha1 = "d6d56282455243f2f92cc1716692c08aa31522d4"; sha1 = "d6d56282455243f2f92cc1716692c08aa31522d4";
}; };
} }
{
name = "prettier___prettier_2.2.1.tgz";
path = fetchurl {
name = "prettier___prettier_2.2.1.tgz";
url = "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz";
sha1 = "795a1a78dd52f073da0cd42b21f9c91381923ff5";
};
}
{
name = "prettier___prettier_1.18.2.tgz";
path = fetchurl {
name = "prettier___prettier_1.18.2.tgz";
url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz";
sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea";
};
}
{ {
name = "pretty_format___pretty_format_25.5.0.tgz"; name = "pretty_format___pretty_format_25.5.0.tgz";
path = fetchurl { path = fetchurl {
@ -11338,11 +11370,11 @@
}; };
} }
{ {
name = "schema_utils___schema_utils_2.6.4.tgz"; name = "schema_utils___schema_utils_2.7.1.tgz";
path = fetchurl { path = fetchurl {
name = "schema_utils___schema_utils_2.6.4.tgz"; name = "schema_utils___schema_utils_2.7.1.tgz";
url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz"; url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz";
sha1 = "a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"; sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7";
}; };
} }
{ {
@ -12202,11 +12234,11 @@
}; };
} }
{ {
name = "style_loader___style_loader_1.1.3.tgz"; name = "style_loader___style_loader_1.3.0.tgz";
path = fetchurl { path = fetchurl {
name = "style_loader___style_loader_1.1.3.tgz"; name = "style_loader___style_loader_1.3.0.tgz";
url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz"; url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz";
sha1 = "9e826e69c683c4d9bf9db924f85e9abb30d5e200"; sha1 = "828b4a3b3b7e7aa5847ce7bae9e874512114249e";
}; };
} }
{ {
@ -13442,11 +13474,11 @@
}; };
} }
{ {
name = "vue_eslint_parser___vue_eslint_parser_7.0.0.tgz"; name = "vue_eslint_parser___vue_eslint_parser_7.3.0.tgz";
path = fetchurl { path = fetchurl {
name = "vue_eslint_parser___vue_eslint_parser_7.0.0.tgz"; name = "vue_eslint_parser___vue_eslint_parser_7.3.0.tgz";
url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz"; url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz";
sha1 = "a4ed2669f87179dedd06afdd8736acbb3a3864d6"; sha1 = "894085839d99d81296fa081d19643733f23d7559";
}; };
} }
{ {
@ -13474,11 +13506,11 @@
}; };
} }
{ {
name = "vue_loader___vue_loader_15.9.5.tgz"; name = "vue_loader___vue_loader_15.9.6.tgz";
path = fetchurl { path = fetchurl {
name = "vue_loader___vue_loader_15.9.5.tgz"; name = "vue_loader___vue_loader_15.9.6.tgz";
url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.5.tgz"; url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.6.tgz";
sha1 = "7a960dc420a3439deaacdda038fdcdbf7c432706"; sha1 = "f4bb9ae20c3a8370af3ecf09b8126d38ffdb6b8b";
}; };
} }
{ {

2
pkgs/data/fonts/iosevka/bin.nix
View File

@ -10,7 +10,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "${name}-bin"; pname = "${name}-bin";
version = "4.5.0"; version = "5.0.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";

44
pkgs/data/fonts/iosevka/variants.nix
View File

@ -1,24 +1,26 @@
# This file was autogenerated. DO NOT EDIT! # This file was autogenerated. DO NOT EDIT!
{ {
iosevka = "1ic5w8w4v27vfq7pvx9wv2zdcsj16xi71ln2a3fb4kh93zj84kl8"; iosevka = "069qy5mnrp61da7b5yy79s9d0s3cwn5mqkqkysv8lccr91qnjgdc";
iosevka-aile = "1qv2b4zcz172knvr39argqshjpin1lidlafilfcm569cp8rasrdd"; iosevka-aile = "1b9zh017wdxlk9dlick6qwx8f2vqsrsaq5yjr79iinirc417ri67";
iosevka-curly = "0x9pdgyiab8hibyf1yrwn6cr90aqy9ygyk1zz9nqzcndk5mk54p4"; iosevka-curly = "155faw2nlczp3ic2y9ck2vm21rfa1zaiswc0mfgmd3b2r6wimjrj";
iosevka-curly-slab = "0mxnbf9dwq3iq5dc0cgrdqf2dlyymylv46psb83n5kra4rz1wxnb"; iosevka-curly-slab = "1axzan1p9slfskg8nshz4hrmw24vmbcsxf7kpz70xjs98w7wh6lh";
iosevka-etoile = "1rz9dkpiwwfjnhiajfxg3rrnf4lyxnynx89qswg0b8wql4q6bz71"; iosevka-etoile = "00w4r660qaydygqvfv03i77h1q6wk8xbvrvh4wsnifl7li4xax4w";
iosevka-slab = "17p0cf4k8k3kabqp0b1anqqj8phfw7nnxiiscnngbrxhdvhpp62n"; iosevka-slab = "0a7ndr3c0sldn902d9c50l63xrvranclsvwnj4py2m6w32s8i9nx";
iosevka-sparkle = "0ip46lcq7gcv77ar6vqz51lhf448fd0nviijfpqfg7gdywdzalm0"; iosevka-ss01 = "0q5bh511z6qdvagk831sb1nrp9gawsjv904106clkqwak3k55v54";
iosevka-ss01 = "1v1z2rx7r6nb45i3qcb9pvilm6yxxkl5ks7ldmm902cx67pkv7rj"; iosevka-ss02 = "1qk250yydi3ff5z3s1099xrdzpwg62lr39wxl9539a2rl0awdw3w";
iosevka-ss02 = "1pd4sbr1p1cf9917nnn22v1kah8jfgm9jpfvq1j51wyr8lnxqz2k"; iosevka-ss03 = "02rblgk9j0bz7pyag3a8p4by76zj0z4gg8iignfff7j3yfszgfhp";
iosevka-ss03 = "0pdbvrzilrxxcaz9gnhnqxvk4ipfxcgys41sasl3znxzij1ary8s"; iosevka-ss04 = "0z9aj5ll5mdgfm8brgwhwabbq31ws8qqzdyyf9s8mq30l0js2wd6";
iosevka-ss04 = "08xwdp5s3dp30qy81j3qwhhqk1bibcpnh2i00a3kyw3g6jsnsvmp"; iosevka-ss05 = "00sclgj25vp3frk1wvlwb83z33xy45171m76jr5x9jspq5nr02fa";
iosevka-ss05 = "1njf1ysd42k2rc2lvg5ilq6q2wvg8dlm04d7wygdamw0yx6sia83"; iosevka-ss06 = "1r9da69k47kiag7ba47panyj5sxgz6icpynbrnz7d7kvqwal842k";
iosevka-ss06 = "04g4m770i1b75gl1lanbs0ibmjj8vg5yfwyn6n0bidfn30z4n01l"; iosevka-ss07 = "0lvdzfha27158bs5p3njyw6gnrm53mpdacaln1bh37mwd967b689";
iosevka-ss07 = "07f1n44f5bvifbns6572ys6zihac6yljv7frm58w7xgyl0a3prvg"; iosevka-ss08 = "1l60yz475m780k6ds5h4n36p82av8ag28l1yr8z8gl7yznf2sf7b";
iosevka-ss08 = "157cq5jfxvr0n7ksqln5mjmr800dbyfy8vwl0ngbf0aiq3mw2x8f"; iosevka-ss09 = "058ln47yv5015c4xnhmyglvdqndbdp0v8n5w73cd73nzfb4y035j";
iosevka-ss09 = "0yib3mhb48g2vjiaviwgcl6lad4dbwwblnmv4zi880bdvz7jrwr9"; iosevka-ss10 = "0966wrbamjkyrjkirv2jzw86yr9l3d5vnb0azi93y0amcrkksmrw";
iosevka-ss10 = "06s0s9x1fiqqmnkm42khasws40db7l68d2ycsm38mx6b62nlsbkr"; iosevka-ss11 = "0y3nhjn38jvcf4ngwgir5hg4vx9fsrfxzlshmynlf7bb6krvfnaq";
iosevka-ss11 = "0yzy322zqas0id70i1p92x7fbim8gai0a61nf6bf33aq3qgsj2w8"; iosevka-ss12 = "09hccisb2lrakjh7fnk43znixly7qbqclmsvhp9mlbpjvlzzq03j";
iosevka-ss12 = "0lhmhwd4z44y4469av6na7k5w4ra47g98dxfi0mb42a4n4sq0k5j"; iosevka-ss13 = "117712kys0fihadpzrwqm3z25z390qjnhligr5k0wx8h0la9nwq3";
iosevka-ss13 = "1cq91iqfgq4fsazi2pjh6l4n9mgci4aayqp7fiy8lydv7f1ym0z9"; iosevka-ss14 = "0iy4m64jnsi2b74hcmwxk0qabzgza08v9s56blg4i9mfmp8xvzlp";
iosevka-ss14 = "0xid48yr2qfsh6kvlajlaqnb43ck351kg8r3bwpvzrdbvl809983"; iosevka-ss15 = "0mdqfal48sfq5n3a88cgsaddcc07qwqynr662zqqpjqy98kvaz62";
iosevka-ss16 = "0dkv3mzhl9vl7x9x0g6hc7j1mp9mnnyx7iamkvm8wcqjhwnvy0r6";
iosevka-ss17 = "1adb1z468wfa1b707kr0ycv5d5nxpmcx44q0dizik5zyx26aq10p";
} }

4
pkgs/development/libraries/oneDNN/default.nix
View File

@ -5,13 +5,13 @@
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "oneDNN"; pname = "oneDNN";
version = "2.0"; version = "2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "oneapi-src"; owner = "oneapi-src";
repo = "oneDNN"; repo = "oneDNN";
rev = "v${version}"; rev = "v${version}";
sha256 = "0r50r9bz7mdhy9z9zdy5m2nhi8r6kqsn70q2rfwylm1vppmhwkfq"; sha256 = "sha256-PZ8r1eNfz4dVxlbtQJSrxiw/Hk6E6wSDapkMy7ux9fI=";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];

2
pkgs/development/node-packages/node-packages.json
View File

@ -115,7 +115,7 @@
, "indium" , "indium"
, "insect" , "insect"
, "ionic" , "ionic"
, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v4.5.0.tar.gz"} , {"iosevka": "https://github.com/be5invis/Iosevka/archive/v5.0.2.tar.gz"}
, "jake" , "jake"
, "javascript-typescript-langserver" , "javascript-typescript-langserver"
, "joplin" , "joplin"

1173
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

13
pkgs/development/python-modules/cvxpy/default.nix
View File

@ -4,40 +4,35 @@
, fetchPypi , fetchPypi
, cvxopt , cvxopt
, ecos , ecos
, multiprocess
, numpy , numpy
, osqp , osqp
, scipy , scipy
, scs , scs
, six
# Check inputs # Check inputs
, pytestCheckHook , pytestCheckHook
, nose
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "cvxpy"; pname = "cvxpy";
version = "1.1.8"; version = "1.1.10";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "444068d4eda9ffcd43578895174489d4cef36b28ba7ae8a96ab9ef9571d2b4ff"; hash = "sha256-7NCouJ95nOolSSjeqHktnGnDfbC9gwtM2mKbKyvlInA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
cvxopt cvxopt
ecos ecos
multiprocess
numpy numpy
osqp osqp
scipy scipy
scs scs
six
]; ];
checkInputs = [ pytestCheckHook nose ]; checkInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "./cvxpy" ]; pytestFlagsArray = [ "./cvxpy" ];
# Disable the slowest benchmarking tests, cuts test time in half # Disable the slowest benchmarking tests, cuts test time in half
disabledTests = [ disabledTests = [
@ -46,7 +41,7 @@ buildPythonPackage rec {
]; ];
meta = with lib; { meta = with lib; {
description = "A domain-specific language for modeling convex optimization problems in Python."; description = "A domain-specific language for modeling convex optimization problems in Python";
homepage = "https://www.cvxpy.org/"; homepage = "https://www.cvxpy.org/";
downloadPage = "https://github.com/cvxgrp/cvxpy/releases"; downloadPage = "https://github.com/cvxgrp/cvxpy/releases";
changelog = "https://github.com/cvxgrp/cvxpy/releases/tag/v${version}"; changelog = "https://github.com/cvxgrp/cvxpy/releases/tag/v${version}";

38
pkgs/development/python-modules/desktop-notifier/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, stdenv
, packaging
, importlib-resources
, dbus-next
}:
buildPythonPackage rec {
pname = "desktop-notifier";
version = "3.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-D8/amC6SwXkm8Ao8G2Vn9FNpbqyFJFBUVcngkW5g8k0=";
};
propagatedBuildInputs = [
packaging
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
] ++ lib.optionals stdenv.isLinux [
dbus-next
];
# no tests available, do the imports check instead
doCheck = false;
pythonImportsCheck = [ "desktop_notifier" ];
meta = with lib; {
homepage = "https://github.com/samschott/desktop-notifier";
description = "A Python library for cross-platform desktop notifications";
license = licenses.mit;
maintainers = with maintainers; [ sfrijters ];
};
}

13
pkgs/development/python-modules/maestral/default.nix
View File

@ -1,30 +1,29 @@
{ lib, stdenv { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pythonOlder , pythonOlder
, python , python
, alembic, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog , alembic, click, desktop-notifier, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog
, importlib-metadata , importlib-metadata
, importlib-resources , importlib-resources
, dbus-next
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "maestral"; pname = "maestral";
version = "1.3.1"; version = "1.4.2";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SamSchott"; owner = "SamSchott";
repo = "maestral"; repo = "maestral";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-SspyTdmAbbmWN3AqVp9bj/QfAKLVgU2bLiiHjZO0aCM="; sha256 = "sha256-ibAYuaPSty275/aQ0DibyWe2LjPoEpdWgElTnR+MEs8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
alembic alembic
bugsnag
click click
desktop-notifier
dropbox dropbox
fasteners fasteners
keyring keyring
@ -42,8 +41,6 @@ buildPythonPackage rec {
importlib-metadata importlib-metadata
] ++ lib.optionals (pythonOlder "3.9") [ ] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources importlib-resources
] ++ lib.optionals stdenv.isLinux [
dbus-next
]; ];
makeWrapperArgs = [ makeWrapperArgs = [

36
pkgs/development/python-modules/pyeight/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, aiohttp
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, isPy3k
}:
buildPythonPackage rec {
pname = "pyeight";
version = "0.1.5";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "mezz64";
repo = "pyEight";
rev = version;
sha256 = "1wzmjqs8zx611b71ip7a0phyas96vxpq8xpnhrirfi9l09kdjgsw";
};
propagatedBuildInputs = [
aiohttp
async-timeout
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pyeight" ];
meta = with lib; {
description = "Python library to interface with the Eight Sleep API";
homepage = "https://github.com/mezz64/pyEight";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/survey/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "survey"; pname = "survey";
version = "3.1.1"; version = "3.4.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-R/PfXW/CnqYiOWbCxPAYwneg6j6CLvdIpITZ2eIXn+M="; sha256 = "sha256-aF7ZS5oxeIOb7mJsrusdc3HefcPE+3OTXcJB/pjJxFY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/watchdog/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "watchdog"; pname = "watchdog";
version = "1.0.2"; version = "2.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-N2y8KjXAOSsP5/8W+8GzA/2Z1N2ZEatVge6daa3IiYI="; sha256 = "sha256-/UtWz74NDZxPxDGs7KdXAKfxLTc33C6csuwrpkloBCU=";
}; };
buildInputs = lib.optionals stdenv.isDarwin buildInputs = lib.optionals stdenv.isDarwin

4
pkgs/development/python-modules/wrapio/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "wrapio"; pname = "wrapio";
version = "0.3.8"; version = "1.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-jGupLh+xzwil+VBtAjIG+ZYT+dy+QaZOTIfipTQeyWo"; sha256 = "sha256-JWcPsqZy1wM6/mbU3H0W3EkpLg0wrEUUg3pT/QrL+rE=";
}; };
doCheck = false; doCheck = false;

20
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -201,13 +201,23 @@ in
gitlab-markup = attrs: { meta.priority = 1; }; gitlab-markup = attrs: { meta.priority = 1; };
gitlab-pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.0") { gitlab-pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.1") {
dontBuild = false; dontBuild = false;
postPatch = '' postPatch = ''
sed -i 's;"https://gitlab.com.*";"${fetchurl { sed -i "s;'https://codeload.github.com.*';'${fetchurl {
url = "https://gitlab.com/gitlab-org/libpg_query/-/archive/gitlab-10-1.0.3/libpg_query-gitlab-10-1.0.3.tar.gz"; url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/10-1.0.3";
sha256 = "1519x4v6wrk189mjg4hlfah0f7hjy3syg8kk8b6g644gdspzs26j"; sha256 = "0jfij8apzxsdabl70j42xgd5f3ka1gdcrk764nccp66164gpcchk";
}}";' ext/pg_query/extconf.rb }}';" ext/pg_query/extconf.rb
'';
};
pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.0") {
dontBuild = false;
postPatch = ''
sed -i "s;'https://codeload.github.com.*';'${fetchurl {
url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/10-1.0.4";
sha256 = "0f0kshhai0pnkqj0w4kgz3fssnvwidllc31n1fysxjjzdqlr1k48";
}}';" ext/pg_query/extconf.rb
''; '';
}; };

4
pkgs/development/tools/misc/strace/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "strace"; pname = "strace";
version = "5.10"; version = "5.11";
src = fetchurl { src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-/jmC6kzZrrO0ujX2J58LV3o3F10ygr4kuaVTe1a48Bw="; sha256 = "sha256-/+NAsQwUWg+Fc0Jx6czlZFfSPyGn6lkxqzL4z055OHk=";
}; };
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];

15
pkgs/development/tools/misc/universal-ctags/default.nix
View File

@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }: { lib, stdenv, fetchFromGitHub, autoreconfHook, coreutils, pkg-config, perl, python3Packages, libiconv, jansson }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "universal-ctags"; pname = "universal-ctags";
version = "unstable-2019-07-30"; version = "5.9.20201206.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "universal-ctags"; owner = "universal-ctags";
repo = "ctags"; repo = "ctags";
rev = "920e7910146915e5cae367bc9f135ffd8b042042"; rev = "p${version}";
sha256 = "14n3ix77rkhq6vq6kspmgjrmm0kg0f8cxikyqdq281sbnfq8bajn"; sha256 = "0w10zjyz46sjm6ypxmq550dkr84hvc4phm4vm9j53jp5s19x5q19";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ]; nativeBuildInputs = [ autoreconfHook coreutils pkg-config python3Packages.docutils ];
buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv; buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv;
# to generate makefile.in # to generate makefile.in
@ -25,6 +25,9 @@ stdenv.mkDerivation {
# Remove source of non-determinism # Remove source of non-determinism
substituteInPlace main/options.c \ substituteInPlace main/options.c \
--replace "printf (\" Compiled: %s, %s\n\", __DATE__, __TIME__);" "" --replace "printf (\" Compiled: %s, %s\n\", __DATE__, __TIME__);" ""
substituteInPlace Tmain/utils.sh \
--replace /bin/echo ${coreutils}/bin/echo
''; '';
postConfigure = '' postConfigure = ''

4
pkgs/development/tools/packer/default.nix
View File

@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: { lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
buildGoPackage rec { buildGoPackage rec {
pname = "packer"; pname = "packer";
version = "1.6.6"; version = "1.7.0";
goPackagePath = "github.com/hashicorp/packer"; goPackagePath = "github.com/hashicorp/packer";
@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "hashicorp"; owner = "hashicorp";
repo = "packer"; repo = "packer";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-kFDy8Zlx+D5JDyNlAmB/ICTe4K9s6KDbALP5pom5OQg="; sha256 = "sha256-x62C44vTIysk9Lx9HZeTBf8k1+P5hfMIijvTWu3cZrA=";
}; };
buildFlagsArray = [ "-ldflags=-s -w" ]; buildFlagsArray = [ "-ldflags=-s -w" ];

6
pkgs/development/tools/rust/maturin/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "maturin"; pname = "maturin";
version = "0.9.1"; version = "0.9.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PyO3"; owner = "PyO3";
repo = "maturin"; repo = "maturin";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-0HD/wtHCbaJ0J+TC6k2xvWsCMnpdJbvivW/UM3g+Gss="; hash = "sha256-3Tir9jvpSgjyF5tEn3xpPcpSATEnn9yaWIKE8hZIdsM=";
}; };
cargoHash = "sha256-bH9NQg7wJUe0MHkbt4DbjZEEVYZiVCwSbL4A/H+6WDs="; cargoHash = "sha256-o0+ZlGnnVUJiTqIdioj+geiP6PWz/AKCXhx+/TgKmqs=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

4
pkgs/development/tools/yq-go/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "yq-go"; pname = "yq-go";
version = "4.4.1"; version = "4.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mikefarah"; owner = "mikefarah";
rev = "v${version}"; rev = "v${version}";
repo = "yq"; repo = "yq";
sha256 = "sha256-U1nMSwWKzPvyvxUx8J50AMB251ET4s9xcSrjGGjkYus="; sha256 = "sha256-ehr9mCUbwQQSLR0iYoiJ3Xvgu+7Ue9Xvru9kAUkPCuQ=";
}; };
vendorSha256 = "sha256-CUELy6ajaoVzomY5lMen24DFJke3IyFzqWYyF7sws5g="; vendorSha256 = "sha256-CUELy6ajaoVzomY5lMen24DFJke3IyFzqWYyF7sws5g=";

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -209,7 +209,7 @@
"ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox
"efergy" = ps: with ps; [ ]; "efergy" = ps: with ps; [ ];
"egardia" = ps: with ps; [ ]; # missing inputs: pythonegardia "egardia" = ps: with ps; [ ]; # missing inputs: pythonegardia
"eight_sleep" = ps: with ps; [ ]; # missing inputs: pyeight "eight_sleep" = ps: with ps; [ pyeight ];
"elgato" = ps: with ps; [ ]; # missing inputs: elgato "elgato" = ps: with ps; [ ]; # missing inputs: elgato
"eliqonline" = ps: with ps; [ ]; # missing inputs: eliqonline "eliqonline" = ps: with ps; [ ]; # missing inputs: eliqonline
"elkm1" = ps: with ps; [ ]; # missing inputs: elkm1-lib "elkm1" = ps: with ps; [ ]; # missing inputs: elkm1-lib

4
pkgs/servers/metabase/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "metabase"; pname = "metabase";
version = "0.37.8"; version = "0.38.0";
src = fetchurl { src = fetchurl {
url = "https://downloads.metabase.com/v${version}/metabase.jar"; url = "https://downloads.metabase.com/v${version}/metabase.jar";
sha256 = "sha256-T3isJcnDUvN4TCd9tZA1p46pamhdPSwIKKAOr6+1F30="; sha256 = "170fj2cc7drh6c1dgl60f9n79vfrsw2v57lmds677naxnq254jhp";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

6
pkgs/servers/plex/raw.nix
View File

@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should # server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes. # automatically pick up the changes.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.21.3.4021-5a0a3e4b2"; version = "1.21.3.4046-3c1c83ba4";
pname = "plexmediaserver"; pname = "plexmediaserver";
# Fetch the source # Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "1342xxbxqq3g0khw3cyib0djy8slsc2b4xxl18lli7wrfcg6kgxb"; sha256 = "1ikv75pgircqnllimx3yszihpfaj8blhrmgvli0lagirx6sg22zl";
} else fetchurl { } else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "05rixrk5nlmnywb7xdkmrk0zpd1ik05dyzz0b09kd212rahw0iig"; sha256 = "1fywpkchpc726a66q7xpqrn92g73v4941df19glscrrvy7808f8n";
}; };
outputs = [ "out" "basedb" ]; outputs = [ "out" "basedb" ];

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

@ -56,8 +56,12 @@ let
# source both, but source the more global configuration files earlier # source both, but source the more global configuration files earlier
# than the more local ones, so that more local configurations inherit # than the more local ones, so that more local configurations inherit
# from but override the more global locations. # from but override the more global locations.
#
# Special care needs to be taken, when fish is called from an FHS user env
# or similar setup, because this configuration file will then be relocated
# to /etc/fish/config.fish, so we test for this case to avoid nontermination.
if test -f /etc/fish/config.fish if test -f /etc/fish/config.fish && test /etc/fish/config.fish != (status filename)
source /etc/fish/config.fish source /etc/fish/config.fish
end end

10
pkgs/tools/admin/google-cloud-sdk/default.nix
View File

@ -21,24 +21,24 @@ let
sources = name: system: { sources = name: system: {
x86_64-darwin = { x86_64-darwin = {
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
sha256 = "135xbaz6q4565mklxjmm4mybm5qayvz34m0bdg609597kxw6l97j"; sha256 = "sha256-aHFwcynt4xQ0T1J+OTSxgttU9W3VFJAqCwmQSdVg8Fk=";
}; };
x86_64-linux = { x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
sha256 = "1i4cp6kyqbqj0fnmwx11bq6a1k4hrhyxz9qifr1qjfi7n8ybqrqy"; sha256 = "sha256-MfldToK7ZfdWZiZnI1qKI1o/dSiUcysxzUkTYMVZ5u4=";
}; };
}.${system}; }.${system};
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "google-cloud-sdk"; pname = "google-cloud-sdk";
version = "327.0.0"; version = "328.0.0";
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
buildInputs = [ python makeWrapper ]; buildInputs = [ python ];
nativeBuildInputs = [ jq ]; nativeBuildInputs = [ jq makeWrapper ];
patches = [ patches = [
# For kubectl configs, don't store the absolute path of the `gcloud` binary as it can be garbage-collected # For kubectl configs, don't store the absolute path of the `gcloud` binary as it can be garbage-collected

8
pkgs/tools/filesystems/bindfs/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, fuse, pkg-config }: { lib, stdenv, fetchurl, fuse, pkg-config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.14.9"; version = "1.15.1";
pname = "bindfs"; pname = "bindfs";
src = fetchurl { src = fetchurl {
url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz";
sha256 = "0fnij365dn4ihkpfc92x63inxxwpminzffyj55krp1w02canpl5n"; sha256 = "sha256-BN01hKbN+a9DRNQDxiGFyp+rMc465aJdAQG8EJNsaKs=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A FUSE filesystem for mounting a directory to another location"; description = "A FUSE filesystem for mounting a directory to another location";
homepage = "https://bindfs.org"; homepage = "https://bindfs.org";
license = lib.licenses.gpl2; license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ lovek323 ]; maintainers = with lib.maintainers; [ lovek323 lovesegfault ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }

9
pkgs/tools/misc/grub/2.0x.nix
View File

@ -1,10 +1,12 @@
{ lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool { lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool
, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config
, fuse # only needed for grub-mount , fuse # only needed for grub-mount
, runtimeShell
, zfs ? null , zfs ? null
, efiSupport ? false , efiSupport ? false
, zfsSupport ? false , zfsSupport ? false
, xenSupport ? false , xenSupport ? false
, kbdcompSupport ? false, ckbcomp
}: }:
with lib; with lib;
@ -53,6 +55,13 @@ stdenv.mkDerivation rec {
./fix-bash-completion.patch ./fix-bash-completion.patch
]; ];
postPatch = if kbdcompSupport then ''
sed -i util/grub-kbdcomp.in -e 's@\bckbcomp\b@${ckbcomp}/bin/ckbcomp@'
'' else ''
echo '#! ${runtimeShell}' > util/grub-kbdcomp.in
echo 'echo "Compile grub2 with { kbdcompSupport = true; } to enable support for this command."' >> util/grub-kbdcomp.in
'';
nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake ]; nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake ];
buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ]
++ optional doCheck qemu ++ optional doCheck qemu

4
pkgs/tools/misc/piston-cli/default.nix
View File

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "piston-cli"; pname = "piston-cli";
version = "1.2.1"; version = "1.2.2";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "bf0hhKb+6+07HhrkFrsWCnUQfsQWOdK/dPTlt9iZTno="; sha256 = "hhOistr5lHF6rIuMpudKwSuBQhaQDzTdelAOCjyVQZk=";
}; };
propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments ]; propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments ];

26
pkgs/tools/system/logrotate/default.nix
View File

@ -14,27 +14,21 @@ stdenv.mkDerivation rec {
}; };
# Logrotate wants to access the 'mail' program; to be done. # Logrotate wants to access the 'mail' program; to be done.
patchPhase = '' configureFlags = [
sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \ "--with-compress-command=${gzip}/bin/gzip"
-e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' configure.ac "--with-uncompress-command=${gzip}/bin/gunzip"
] ++ lib.optionals (mailutils != null) [
${lib.optionalString (mailutils != null) '' "--with-default-mail-command=${mailutils}/bin/mail"
sed -i -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac ];
''}
'';
autoreconfPhase = ''
./autogen.sh
'';
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ popt ]; buildInputs = [ popt ];
meta = { meta = with lib; {
homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; homepage = "https://fedorahosted.org/releases/l/o/logrotate/";
description = "Rotates and compresses system logs"; description = "Rotates and compresses system logs";
license = lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ lib.maintainers.viric ]; maintainers = [ maintainers.viric ];
platforms = lib.platforms.all; platforms = platforms.all;
}; };
} }

19
pkgs/tools/text/ledger2beancount/default.nix
View File

@ -4,21 +4,26 @@ with lib;
let let
perlDeps = with perlPackages; [ perlDeps = with perlPackages; [
ConfigOnion DateCalc DateCalc
FileBaseDir YAMLLibYAML DateTimeFormatStrptime
GetoptLongDescriptive DateTimeFormatStrptime enum
FileBaseDir
GetoptLongDescriptive
ListMoreUtils
RegexpCommon
StringInterpolate StringInterpolate
YAMLLibYAML
]; ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "ledger2beancount"; pname = "ledger2beancount";
version = "2.1"; version = "2.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zacchiro"; owner = "beancount";
repo = "ledger2beancount"; repo = "ledger2beancount";
rev = version; rev = version;
sha256 = "0w88jb1x0w02jwwf6ipx3cxr89kzffrrdqws3556zrvvs01bh84j"; sha256 = "0kimp8l9ax37grfv5r5iw0g0xnrpkak022fl10y3i7kc4nyi1s99";
}; };
phases = [ phases = [
@ -50,7 +55,7 @@ in stdenv.mkDerivation rec {
Conversion is based on (concrete) syntax, so that information that is not meaningful for accounting reasons but still valuable (e.g., comments, formatting, etc.) can be preserved. Conversion is based on (concrete) syntax, so that information that is not meaningful for accounting reasons but still valuable (e.g., comments, formatting, etc.) can be preserved.
''; '';
homepage = "https://github.com/zacchiro/ledger2beancount"; homepage = "https://github.com/beancount/ledger2beancount";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ pablovsky ]; maintainers = with maintainers; [ pablovsky ];

12
pkgs/tools/text/markdown-pp/default.nix
View File

@ -1,13 +1,15 @@
{ fetchFromGitHub, pythonPackages, lib }: { lib
, fetchFromGitHub
, python3
}:
with pythonPackages; python3.pkgs.buildPythonApplication rec {
buildPythonApplication rec {
pname = "MarkdownPP"; pname = "MarkdownPP";
version = "1.5.1"; version = "1.5.1";
propagatedBuildInputs = [ pillow watchdog ]; propagatedBuildInputs = with python3.pkgs; [ pillow watchdog ];
checkPhase = '' checkPhase = ''
cd test cd test
PATH=$out/bin:$PATH ${python}/bin/${python.executable} test.py PATH=$out/bin:$PATH ${python3}/bin/${python3.executable} test.py
''; '';
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jreese"; owner = "jreese";

2
pkgs/tools/text/ripgrep/default.nix
View File

@ -37,8 +37,6 @@ rustPlatform.buildRustPackage rec {
installShellCompletion --zsh complete/_rg installShellCompletion --zsh complete/_rg
''; '';
passthru.tests = { inherit (nixosTests) ripgrep; };
meta = with lib; { meta = with lib; {
description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
homepage = "https://github.com/BurntSushi/ripgrep"; homepage = "https://github.com/BurntSushi/ripgrep";

2
pkgs/top-level/all-packages.nix
View File

@ -21612,6 +21612,8 @@ in
python3Packages = python37Packages; python3Packages = python37Packages;
}; };
cqrlog = callPackage ../applications/radio/cqrlog { };
crun = callPackage ../applications/virtualization/crun {}; crun = callPackage ../applications/virtualization/crun {};
csdp = callPackage ../applications/science/math/csdp { }; csdp = callPackage ../applications/science/math/csdp { };

19
pkgs/top-level/python-packages.nix
View File

@ -1708,6 +1708,8 @@ in {
deskcon = callPackage ../development/python-modules/deskcon { }; deskcon = callPackage ../development/python-modules/deskcon { };
desktop-notifier = callPackage ../development/python-modules/desktop-notifier { };
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { }; devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { };
@ -3872,20 +3874,11 @@ in {
macropy = callPackage ../development/python-modules/macropy { }; macropy = callPackage ../development/python-modules/macropy { };
maestral = callPackage ../development/python-modules/maestral { maestral = callPackage ../development/python-modules/maestral {
keyring = self.keyring.overridePythonAttrs (old: rec {
# https://github.com/SamSchott/maestral/issues/250#issuecomment-739510048 version = "22.0.1";
survey = self.survey.overridePythonAttrs (old: rec {
version = "2.2.1";
src = old.src.override { src = old.src.override {
inherit version; inherit version;
sha256 = "sha256-7ubWkqk1vyaJDLMOuKwUx2Bjziyi3HqpaQq4pKp4Z+0="; sha256 = "sha256-mss+FFLtu3VEgisS/SVFkHh2nlYPpR9Bi20Ar6pheN8=";
};
});
watchdog = self.watchdog.overridePythonAttrs (old: rec {
version = "0.10.3";
src = old.src.override {
inherit version;
sha256 = "4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04";
}; };
}); });
}; };
@ -5407,6 +5400,8 @@ in {
pyee = callPackage ../development/python-modules/pyee { }; pyee = callPackage ../development/python-modules/pyee { };
pyeight = callPackage ../development/python-modules/pyeight { };
pyelftools = callPackage ../development/python-modules/pyelftools { }; pyelftools = callPackage ../development/python-modules/pyelftools { };
pyemd = callPackage ../development/python-modules/pyemd { }; pyemd = callPackage ../development/python-modules/pyemd { };