public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-04-06 16:25:41 +02:00
parent 52cd3538ff c04a14edd6
commit 70babe5bcf
485 changed files with 4663 additions and 2031 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+7 -4
View File
@@ -1431,7 +1431,8 @@ in {
conda = callPackage ../development/python-modules/conda { };
ConfigArgParse = callPackage ../development/python-modules/configargparse { };
ConfigArgParse = self.configargparse; # added 2021-03-18
configargparse = callPackage ../development/python-modules/configargparse { };
configobj = callPackage ../development/python-modules/configobj { };
@@ -1949,6 +1950,8 @@ in {
docutils = callPackage ../development/python-modules/docutils { };
docx2python = callPackage ../development/python-modules/docx2python { };
dodgy = callPackage ../development/python-modules/dodgy { };
dogpile_cache = callPackage ../development/python-modules/dogpile.cache { };
@@ -3466,9 +3469,7 @@ in {
keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { };
kerberos = callPackage ../development/python-modules/kerberos {
inherit (pkgs) kerberos;
};
kerberos = callPackage ../development/python-modules/kerberos { };
keyring = callPackage ../development/python-modules/keyring { };
@@ -6784,6 +6785,8 @@ in {
ring-doorbell = callPackage ../development/python-modules/ring-doorbell { };
riprova = callPackage ../development/python-modules/riprova { };
ripser = callPackage ../development/python-modules/ripser { };
rising = callPackage ../development/python-modules/rising { };