diff --git a/pkgs/development/python-modules/scipy.nix b/pkgs/development/python-modules/scipy.nix index ae312cd32d59..023335a5e347 100644 --- a/pkgs/development/python-modules/scipy.nix +++ b/pkgs/development/python-modules/scipy.nix @@ -12,6 +12,11 @@ in buildPythonPackage (args // rec { buildInputs = (args.buildInputs or [ gfortran nose ]); propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]); + # Remove tests because of broken wrapper + prePatch = '' + rm scipy/linalg/tests/test_lapack.py + ''; + preConfigure = '' sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dccab56d0f67..9cd0bed5b7c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20889,16 +20889,7 @@ in modules // { gfortran = pkgs.gfortran; }; - scipy = self.scipy_0_17; - - scipy_0_16 = self.buildScipyPackage rec { - version = "0.16.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; - sha256 = "ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260"; - }; - numpy = self.numpy; - }; + scipy = self.scipy_0_18; scipy_0_17 = self.buildScipyPackage rec { version = "0.17.1"; @@ -20909,6 +20900,15 @@ in modules // { numpy = self.numpy; }; + scipy_0_18 = self.buildScipyPackage rec { + version = "0.18.0"; + src = pkgs.fetchurl { + url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; + sha256 = "f01784fb1c2bc246d4211f2482ecf4369db5abaecb9d5afb9d94f6c59663286a"; + }; + numpy = self.numpy; + }; + scikitimage = buildPythonPackage rec { name = "scikit-image-${version}"; version = "0.11.3";