Author: simons
Date: Wed May 9 07:22:18 2012
New Revision: 34023
URL: https://nixos.org/websvn/nix/?rev=34023&sc=1
Log:
numpy: reverted build fix that committed earlier on behalf of Konrad Hinsen
The patch broke the build of matplotlib.
Deleted:
nixpkgs/trunk/pkgs/development/python-modules/numpy/
Modified:
nixpkgs/trunk/pkgs/top-level/python-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/python-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/python-packages.nix Wed May 9 06:42:54
2012 (r34022)
+++ nixpkgs/trunk/pkgs/top-level/python-packages.nix Wed May 9 07:22:18
2012 (r34023)
@@ -1179,10 +1179,9 @@
sha256 = "1pawfmf7j7pd3mjzhmmw9hkglc2qdirrkvv29m5nsmpf2b3ip2vq";
};
- patches = [ ../development/python-modules/numpy/no_default_dirs.patch ];
-
+ # TODO: add ATLAS=${pkgs.atlas}
installCommand = ''
- export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} ATLAS=${pkgs.atlas}
+ export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack}
python setup.py build --fcompiler="gnu95"
python setup.py install --prefix=$out
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
