public/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-05-14 00:58:11 +00:00
committed by GitHub
parent 39e3f7c2cc 7cd876f22d
commit bf5d8bb531
89 changed files with 2361 additions and 2905 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+4 -4
View File
@@ -9034,6 +9034,8 @@ in
tthsum = callPackage ../applications/misc/tthsum { };
ttp = with python3.pkgs; toPythonApplication ttp;
chaps = callPackage ../tools/security/chaps { };
trace-cmd = callPackage ../os-specific/linux/trace-cmd { };
@@ -11883,7 +11885,7 @@ in
beam_nox = callPackage ./beam-packages.nix { wxSupport = false; };
inherit (beam.interpreters)
erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18
erlang erlangR24 erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18
erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02
elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7
elixir_ls;
@@ -19327,9 +19329,7 @@ in
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
prometheus = callPackage ../servers/monitoring/prometheus {
buildGoPackage = buildGo115Package;
};
prometheus = callPackage ../servers/monitoring/prometheus { };
prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { };
prometheus-artifactory-exporter = callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix { };
pkgs/top-level/beam-packages.nix
+15
View File
@@ -14,6 +14,21 @@ rec {
# Standard Erlang versions, using the generic builder.
# R24
erlangR24 = lib.callErlang ../development/interpreters/erlang/R24.nix {
wxGTK = wxGTK30;
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
parallelBuild = true;
autoconf = buildPackages.autoconf269;
inherit wxSupport;
};
erlangR24_odbc = erlangR24.override { odbcSupport = true; };
erlangR24_javac = erlangR24.override { javacSupport = true; };
erlangR24_odbc_javac = erlangR24.override {
javacSupport = true;
odbcSupport = true;
};
# R23
erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix {
wxGTK = wxGTK30;
pkgs/top-level/python-packages.nix
+15 -1
View File
@@ -409,7 +409,11 @@ in {
ansi2html = callPackage ../development/python-modules/ansi2html { };
ansible = callPackage ../development/python-modules/ansible { };
ansible = callPackage ../development/python-modules/ansible/legacy.nix { };
ansible-base = callPackage ../development/python-modules/ansible/base.nix { };
ansible-collections = callPackage ../development/python-modules/ansible/collections.nix { };
ansible-kernel = callPackage ../development/python-modules/ansible-kernel { };
@@ -3583,6 +3587,8 @@ in {
jwcrypto = callPackage ../development/python-modules/jwcrypto { };
jxmlease = callPackage ../development/python-modules/jxmlease { };
k5test = callPackage ../development/python-modules/k5test {
inherit (pkgs) krb5Full findutils which;
};
@@ -5895,6 +5901,8 @@ in {
pynest2d = callPackage ../development/python-modules/pynest2d { };
pynetbox = callPackage ../development/python-modules/pynetbox { };
pynetdicom = callPackage ../development/python-modules/pynetdicom { };
pynisher = callPackage ../development/python-modules/pynisher { };
@@ -6891,6 +6899,8 @@ in {
pyx = callPackage ../development/python-modules/pyx { };
pyxb = callPackage ../development/python-modules/pyxb { };
pyxbe = callPackage ../development/python-modules/pyxbe { };
pyxdg = callPackage ../development/python-modules/pyxdg { };
@@ -8277,6 +8287,8 @@ in {
trytond = callPackage ../development/python-modules/trytond { };
ttp = callPackage ../development/python-modules/ttp { };
tunigo = callPackage ../development/python-modules/tunigo { };
tubeup = callPackage ../development/python-modules/tubeup { };
@@ -8870,6 +8882,8 @@ in {
yanc = callPackage ../development/python-modules/yanc { };
yangson = callPackage ../development/python-modules/yangson { };
yapf = callPackage ../development/python-modules/yapf { };
yappi = callPackage ../development/python-modules/yappi { };