ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

pythonPackages.scipy: 0.17.1 -> 0.18.0

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-07-28 11:03:27 +02:00
parent 3e5db479b7
commit 6628c55986
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/scipy.nix
View File

@ -12,6 +12,11 @@ in buildPythonPackage (args // rec {
buildInputs = (args.buildInputs or [ gfortran nose ]); buildInputs = (args.buildInputs or [ gfortran nose ]);
propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]); propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]);
# Remove tests because of broken wrapper
prePatch = ''
rm scipy/linalg/tests/test_lapack.py
'';
preConfigure = '' preConfigure = ''
sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
''; '';

20
pkgs/top-level/python-packages.nix
View File

@ -20889,16 +20889,7 @@ in modules // {
gfortran = pkgs.gfortran; gfortran = pkgs.gfortran;
}; };
scipy = self.scipy_0_17; scipy = self.scipy_0_18;
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_0_17 = self.buildScipyPackage rec { scipy_0_17 = self.buildScipyPackage rec {
version = "0.17.1"; version = "0.17.1";
@ -20909,6 +20900,15 @@ in modules // {
numpy = self.numpy; 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 { scikitimage = buildPythonPackage rec {
name = "scikit-image-${version}"; name = "scikit-image-${version}";
version = "0.11.3"; version = "0.11.3";