diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-04-25 18:19:13 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-04-25 18:19:13 +0200 |
| commit | 3dc10d62deebfe5ef3733fa4d2f0790768d88493 (patch) | |
| tree | 25fa4aaf9089db61637b7252a0775256f8e57bb4 /pkgs/top-level | |
| parent | a8f1a965402469476e849d86cca1badaa3eb1f9f (diff) | |
| download | nixlib-3dc10d62deebfe5ef3733fa4d2f0790768d88493.tar nixlib-3dc10d62deebfe5ef3733fa4d2f0790768d88493.tar.gz nixlib-3dc10d62deebfe5ef3733fa4d2f0790768d88493.tar.bz2 nixlib-3dc10d62deebfe5ef3733fa4d2f0790768d88493.tar.lz nixlib-3dc10d62deebfe5ef3733fa4d2f0790768d88493.tar.xz nixlib-3dc10d62deebfe5ef3733fa4d2f0790768d88493.tar.zst nixlib-3dc10d62deebfe5ef3733fa4d2f0790768d88493.zip | |
Revert "pythonPackages.scikitlearn: don't propagate blas"
This reverts commit 18396e8273cad2870a135a8a8c58a04cbb56deb1.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 23aa0c8d3ce1..0564fc9870a7 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 numpy.blas self.nose ]; meta = { description = "QuTiP - Quantum Toolbox in Python"; @@ -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"; |