python.pkgs.scipy: move expression and keep only a single version

Changed files
+16 -46
pkgs
development
python-modules
scipy
top-level
+15 -14
pkgs/development/python-modules/scipy.nix pkgs/development/python-modules/scipy/default.nix
···
-
{lib, python, buildPythonPackage, isPyPy, gfortran, nose}:
+
{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, numpy}:
-
args:
+
buildPythonPackage rec {
+
pname = "scipy";
+
version = "0.19.0";
+
name = "${pname}-${version}";
-
let
-
inherit (args) version;
-
inherit (args) numpy;
-
in buildPythonPackage (args // rec {
+
src = fetchurl {
+
url = "mirror://pypi/s/scipy/scipy-${version}.zip";
+
sha256 = "4190d34bf9a09626cd42100bbb12e3d96b2daf1a8a3244e991263eb693732122";
+
};
-
name = "scipy-${version}";
-
-
buildInputs = (args.buildInputs or [ gfortran nose ]);
-
propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]);
+
buildInputs = [ gfortran nose numpy.blas ];
+
propagatedBuildInputs = [ numpy ];
# Remove tests because of broken wrapper
prePatch = ''
···
echo "Creating site.cfg file..."
cat << EOF > site.cfg
[openblas]
-
include_dirs = ${passthru.blas}/include
-
library_dirs = ${passthru.blas}/lib
+
include_dirs = ${numpy.blas}/include
+
library_dirs = ${numpy.blas}/lib
EOF
'';
···
description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. ";
homepage = http://www.scipy.org/;
maintainers = with lib.maintainers; [ fridh ];
-
} // (args.meta or {});
-
})
+
};
+
}
+1 -32
pkgs/top-level/python-packages.nix
···
-
buildScipyPackage = callPackage ../development/python-modules/scipy.nix {
-
gfortran = pkgs.gfortran;
-
};
-
-
scipy = self.scipy_0_19;
-
-
scipy_0_17 = self.buildScipyPackage rec {
-
version = "0.17.1";
-
src = pkgs.fetchurl {
-
url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz";
-
sha256 = "1b1qpfz2j2rvmlplsjbnznnxnqr9ckbmis506110ii1w07wd4k4w";
-
};
-
numpy = self.numpy;
-
};
-
-
scipy_0_18 = self.buildScipyPackage rec {
-
version = "0.18.1";
-
src = pkgs.fetchurl {
-
url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz";
-
sha256 = "8ab6e9c808bf2fb3e8576cd8cf07226d9cdc18b012c06d9708429a821ac6634e";
-
};
-
numpy = self.numpy;
-
};
-
-
scipy_0_19 = self.buildScipyPackage rec {
-
version = "0.19.0";
-
src = pkgs.fetchurl {
-
url = "mirror://pypi/s/scipy/scipy-${version}.zip";
-
sha256 = "4190d34bf9a09626cd42100bbb12e3d96b2daf1a8a3244e991263eb693732122";
-
};
-
numpy = self.numpy;
-
};
+
scipy = callPackage ../development/python-modules/scipy { };
scikitimage = buildPythonPackage rec {
name = "scikit-image-${version}";