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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2021-04-06 16:01:14 +02:00
parent 44e3fc61fe 413e9561f8
commit c04a14edd6
493 changed files with 4687 additions and 2055 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+7 -4
View File
@@ -1489,7 +1489,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 { };
@@ -2034,6 +2035,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 { };
@@ -3662,9 +3665,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 = if isPy3k then
callPackage ../development/python-modules/keyring { }
@@ -7294,6 +7295,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 { };