diff options
| -rw-r--r-- | pkgs/development/python-modules/numpy.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy.nix index 14504d92543..16c919eb4b2 100644 --- a/pkgs/development/python-modules/numpy.nix +++ b/pkgs/development/python-modules/numpy.nix @@ -39,15 +39,18 @@ in buildPythonPackage (args // rec { runHook postCheck ''; + postInstall = '' + ln -s $out/bin/f2py* $out/bin/f2py + ''; + passthru = { blas = blas; }; - # The large file support test is disabled because it takes forever - # and can cause the machine to run out of disk space when run. - prePatch = '' - sed -i 's/test_large_file_support/donttest/' numpy/lib/tests/test_format.py - ''; + # Disable two tests + # - test_f2py: f2py isn't yet on path. + # - test_large_file_support: takes a long time and can cause the machine to run out of disk space + NOSE_EXCLUDE="test_f2py,test_large_file_support"; meta = { description = "Scientific tools for Python"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 411b1bea3e4..0a818909901 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16073,10 +16073,10 @@ in { }; numpy_1_11 = self.buildNumpyPackage rec { - version = "1.11.2"; + version = "1.11.3"; src = pkgs.fetchurl { - url = "mirror://pypi/n/numpy/numpy-${version}.tar.gz"; - sha256 = "04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69"; + url = "mirror://pypi/n/numpy/numpy-${version}.zip"; + sha256 = "2e0fc5248246a64628656fe14fcab0a959741a2820e003bd15538226501b82f7"; }; }; |