Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-05-14 00:58:11 +00:00
committed by GitHub
89 changed files with 2361 additions and 2905 deletions
+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 { };