From 983f300d74852b5a4a810085a508d413d9c56a1f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 25 Apr 2016 17:46:06 +0200 Subject: [PATCH 1/5] pythonPackages.numpy: don't propagate blas --- pkgs/development/python-modules/numpy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy.nix index 141c8b14fa6..0276d9ede3d 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 ]; - propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ]; + buildInputs = args.buildInputs or [ gfortran nose passthru.blas ]; + propagatedBuildInputs = args.propagatedBuildInputs or [ ]; preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py From d05783a8d7cc07760542f7f2fc30be576cb29ce6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 25 Apr 2016 17:46:15 +0200 Subject: [PATCH 2/5] pythonPackages.scipy: don't propagate blas --- pkgs/development/python-modules/scipy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scipy.nix b/pkgs/development/python-modules/scipy.nix index ae312cd32d5..b31f539ebdd 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 ]); - propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]); + buildInputs = (args.buildInputs or [ gfortran nose passthru.blas ]); + propagatedBuildInputs = (args.propagatedBuildInputs or [ numpy]); preConfigure = '' sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py From 291ec17c5872a1d197581c40f8b71ca6921a40fe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 25 Apr 2016 17:47:05 +0200 Subject: [PATCH 3/5] pythonPackages.qutip: use numpy.blas --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 429acdd6347..62aafc3f652 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18717,7 +18717,7 @@ in modules // { propagatedBuildInputs = with self; [ numpy scipy matplotlib pyqt4 cython ]; - buildInputs = [ pkgs.gcc pkgs.qt4 pkgs.blas self.nose ]; + buildInputs = [ pkgs.gcc pkgs.qt4 numpy.blas self.nose ]; meta = { description = "QuTiP - Quantum Toolbox in Python"; From 18396e8273cad2870a135a8a8c58a04cbb56deb1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 25 Apr 2016 17:47:25 +0200 Subject: [PATCH 4/5] pythonPackages.scikitlearn: don't propagate blas --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62aafc3f652..d3aa9ee9b17 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18717,7 +18717,7 @@ in modules // { propagatedBuildInputs = with self; [ numpy scipy matplotlib pyqt4 cython ]; - buildInputs = [ pkgs.gcc pkgs.qt4 numpy.blas self.nose ]; + buildInputs = [ pkgs.gcc pkgs.qt4 self.numpy.blas self.nose ]; meta = { description = "QuTiP - Quantum Toolbox in Python"; @@ -19629,8 +19629,8 @@ in modules // { sha256 = "9f4cf58e57d81783289fc503caaed1f210bab49b7a6f680bf3c04b1e0a96e5f0"; }; - buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; - propagatedBuildInputs = with self; [ numpy scipy numpy.blas ]; + buildInputs = with self; [ numpy.blas nose pillow pkgs.gfortran pkgs.glibcLocales ]; + propagatedBuildInputs = with self; [ numpy scipy ]; LC_ALL="en_US.UTF-8"; From 564978837139e4f86bccfa0115715c0e70717650 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 25 Apr 2016 17:58:15 +0200 Subject: [PATCH 5/5] pythonPackages.scipy_0_16: use correct numpy --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3aa9ee9b17..20184bfd8d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19586,7 +19586,7 @@ in modules // { url = "https://pypi.python.org/packages/source/s/scipy/scipy-${version}.tar.gz"; sha256 = "ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260"; }; - numpy = self.numpy_1_10; + numpy = self.numpy; }; scipy_0_17 = self.buildScipyPackage rec {