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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-08-17 17:51:54 +02:00
parent 7894420373 0ac85bc455
commit 7dba683656
499 changed files with 2713 additions and 6206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+6 -2
View File
@@ -2566,6 +2566,8 @@ in {
mxnet = callPackage ../development/python-modules/mxnet { };
nplusone = callPackage ../development/python-modules/nplusone { };
parsy = callPackage ../development/python-modules/parsy { };
portalocker = callPackage ../development/python-modules/portalocker { };
@@ -2732,6 +2734,8 @@ in {
pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { };
pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { };
pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { };
pytest-random-order = callPackage ../development/python-modules/pytest-random-order { };
@@ -4752,8 +4756,6 @@ in {
markdown-macros = callPackage ../development/python-modules/markdown-macros { };
mathics = callPackage ../development/python-modules/mathics { };
matplotlib = let
path = if isPy3k then ../development/python-modules/matplotlib/default.nix else
../development/python-modules/matplotlib/2.nix;
@@ -6563,6 +6565,8 @@ in {
stevedore = callPackage ../development/python-modules/stevedore {};
svglib = callPackage ../development/python-modules/svglib { };
text-unidecode = callPackage ../development/python-modules/text-unidecode { };
Theano = callPackage ../development/python-modules/Theano rec {