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:
Frederik Rietdijk
2020-08-26 08:42:36 +02:00
parent 62f046e902 f6286dea88
commit b61ad0afc2
86 changed files with 2222 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+6 -1
View File
@@ -4917,6 +4917,8 @@ in {
multiprocess = callPackage ../development/python-modules/multiprocess { };
multitasking = callPackage ../development/python-modules/multitasking { };
munkres = callPackage ../development/python-modules/munkres { };
musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { };
@@ -5950,7 +5952,8 @@ in {
readchar = callPackage ../development/python-modules/readchar { };
retworkx = callPackage ../development/python-modules/retworkx { };
retworkx = disabledIf (pythonOlder "3.5")
(toPythonModule (callPackage ../development/python-modules/retworkx { } ));
rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override {
python3 = python;
@@ -7746,6 +7749,8 @@ in {
yattag = callPackage ../development/python-modules/yattag { };
yfinance = callPackage ../development/python-modules/yfinance { };
xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { });
z3 = (toPythonModule (pkgs.z3.override {