diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-19 19:31:15 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-19 19:58:12 +0100 |
commit | 9099c7e45698f43f22289096a6d50bce81c6ecb8 (patch) | |
tree | 547edc21aa52f322c4f7a06d5521ec4108d7e0e6 /pkgs/development/python-modules/scipy | |
parent | 9b0b85345ce982426d6d16f086c06eb174d9a024 (diff) |
pythonPackages.scipy: 1.3.3 -> 1.4.1
Diffstat (limited to 'pkgs/development/python-modules/scipy')
-rw-r--r-- | pkgs/development/python-modules/scipy/default.nix | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 682d70df3933f..6c62adb7821ce 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,17 +1,24 @@ -{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy}: - -buildPythonPackage rec { +{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy, pybind11}: + +let + pybind = pybind11.overridePythonAttrs(oldAttrs: { + cmakeFlags = oldAttrs.cmakeFlags ++ [ + "-DPYBIND11_TEST=off" + ]; + doCheck = false; # Circular test dependency + }); +in buildPythonPackage rec { pname = "scipy"; - version = "1.3.3"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "64bf4e8ae0db2d42b58477817f648d81e77f0b381d0ea4427385bba3f959380a"; + sha256 = "dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59"; }; checkInputs = [ nose pytest ]; nativeBuildInputs = [ gfortran ]; - buildInputs = [ numpy.blas ]; + buildInputs = [ numpy.blas pybind ]; propagatedBuildInputs = [ numpy ]; # Remove tests because of broken wrapper @@ -19,9 +26,7 @@ buildPythonPackage rec { rm scipy/linalg/tests/test_lapack.py ''; - # INTERNALERROR, solved with https://github.com/scipy/scipy/pull/8871 - # however, it does not apply cleanly. - doCheck = false; + doCheck = true; preConfigure = '' sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py |