alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

Merge pull request from FRidh/pythonblas

Browse source 
Python: don't propagate blas
This commit is contained in:
Frederik Rietdijk 2016-04-25 18:00:36 +02:00
commit 14b704c842
3 changed files with 8 additions and 8 deletions
pkgs
development/python-modules
numpy.nixscipy.nix
top-level
python-packages.nix

4
pkgs/development/python-modules/numpy.nix
View file

@ -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

4
pkgs/development/python-modules/scipy.nix
View file

@ -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

8
pkgs/top-level/python-packages.nix
View file

@ -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";