diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-04-25 18:14:16 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-04-25 18:14:16 +0200 |
| commit | 48177a18f84948469dad9b57a5bf27bf7d3d9a08 (patch) | |
| tree | ad071998619d948759bd5931fb3076a73267c111 | |
| parent | fish: only use kbd on linux (diff) | |
| download | nixpkgs-origin/revert-14975-pythonblas.tar.gz | |
Revert "Python: don't propagate blas"origin/revert-14975-pythonblas
| -rw-r--r-- | pkgs/development/python-modules/numpy.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/scipy.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy.nix index 0276d9ede3dd..141c8b14fa6d 100644 --- a/pkgs/development/python-modules/numpy.nix +++ b/pkgs/development/python-modules/numpy.nix @@ -9,8 +9,8 @@ in buildPythonPackage (args // rec { name = "numpy-${version}"; disabled = isPyPy; - buildInputs = args.buildInputs or [ gfortran nose passthru.blas ]; - propagatedBuildInputs = args.propagatedBuildInputs or [ ]; + buildInputs = args.buildInputs or [ gfortran nose ]; + propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ]; preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py diff --git a/pkgs/development/python-modules/scipy.nix b/pkgs/development/python-modules/scipy.nix index b31f539ebdd4..ae312cd32d59 100644 --- a/pkgs/development/python-modules/scipy.nix +++ b/pkgs/development/python-modules/scipy.nix @@ -9,8 +9,8 @@ in buildPythonPackage (args // rec { name = "scipy-${version}"; - buildInputs = (args.buildInputs or [ gfortran nose passthru.blas ]); - propagatedBuildInputs = (args.propagatedBuildInputs or [ numpy]); + buildInputs = (args.buildInputs or [ gfortran nose ]); + propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]); 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 23aa0c8d3ce1..304c4932d8e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18718,7 +18718,7 @@ in modules // { propagatedBuildInputs = with self; [ numpy scipy matplotlib pyqt4 cython ]; - buildInputs = [ pkgs.gcc pkgs.qt4 self.numpy.blas self.nose ]; + buildInputs = [ pkgs.gcc pkgs.qt4 pkgs.blas self.nose ]; meta = { description = "QuTiP - Quantum Toolbox in Python"; @@ -19587,7 +19587,7 @@ in modules // { url = "https://pypi.python.org/packages/source/s/scipy/scipy-${version}.tar.gz"; sha256 = "ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260"; }; - numpy = self.numpy; + numpy = self.numpy_1_10; }; scipy_0_17 = self.buildScipyPackage rec { @@ -19630,8 +19630,8 @@ in modules // { sha256 = "9f4cf58e57d81783289fc503caaed1f210bab49b7a6f680bf3c04b1e0a96e5f0"; }; - buildInputs = with self; [ numpy.blas nose pillow pkgs.gfortran pkgs.glibcLocales ]; - propagatedBuildInputs = with self; [ numpy scipy ]; + buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; + propagatedBuildInputs = with self; [ numpy scipy numpy.blas ]; LC_ALL="en_US.UTF-8"; |