diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-04-25 18:00:36 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-04-25 18:00:36 +0200 |
| commit | 14b704c842e7b515653611ba56a9941694fd08fc (patch) | |
| tree | 21a6eea61c0d293f7ab6fb4d5b499365c81f6835 /pkgs/top-level | |
| parent | f9e5eccb13ffbbac3381cfa85ffd1748d3dacd77 (diff) | |
| parent | 564978837139e4f86bccfa0115715c0e70717650 (diff) | |
| download | nixlib-14b704c842e7b515653611ba56a9941694fd08fc.tar nixlib-14b704c842e7b515653611ba56a9941694fd08fc.tar.gz nixlib-14b704c842e7b515653611ba56a9941694fd08fc.tar.bz2 nixlib-14b704c842e7b515653611ba56a9941694fd08fc.tar.lz nixlib-14b704c842e7b515653611ba56a9941694fd08fc.tar.xz nixlib-14b704c842e7b515653611ba56a9941694fd08fc.tar.zst nixlib-14b704c842e7b515653611ba56a9941694fd08fc.zip | |
Merge pull request #14975 from FRidh/pythonblas
Python: don't propagate blas
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 304c4932d8e8..23aa0c8d3ce1 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 pkgs.blas self.nose ]; + buildInputs = [ pkgs.gcc pkgs.qt4 self.numpy.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_1_10; + numpy = self.numpy; }; scipy_0_17 = self.buildScipyPackage rec { @@ -19630,8 +19630,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"; |