public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove lingering dependence on atlas with numpy.

Browse Source 
Closes https://github.com/NixOS/nixpkgs/pull/8133.
This commit is contained in:
Allen Nelson 2015-06-02 10:58:17 -05:00 committed by Peter Simons
parent f1587a2d1e
commit 8bf170f280
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/numpy-scipy-support.nix
View File

@ -8,6 +8,9 @@
}: }:
{ {
# Re-export atlas here so that it can be sure that the same one will be used
# in the propagatedBuildInputs.
inherit atlas;
# First "install" the package, then import what was installed, and call the # First "install" the package, then import what was installed, and call the
# .test() function, which will run the test suite. # .test() function, which will run the test suite.
@ -40,7 +43,7 @@
runHook postCheck runHook postCheck
''; '';
# Creates a site.cfg telling the setup script where to find depended-on # Creates a site.cfg telling the setup script where to find depended-on
# math libraries. # math libraries.
preBuild = '' preBuild = ''
echo "Creating site.cfg file..." echo "Creating site.cfg file..."

2
pkgs/top-level/python-packages.nix
View File

@ -7821,7 +7821,7 @@ let
setupPyBuildFlags = ["--fcompiler='gnu95'"]; setupPyBuildFlags = ["--fcompiler='gnu95'"];
buildInputs = [ pkgs.gfortran self.nose ]; buildInputs = [ pkgs.gfortran self.nose ];
propagatedBuildInputs = [ pkgs.atlas ]; propagatedBuildInputs = [ support.atlas ];
meta = { meta = {
description = "Scientific tools for Python"; description = "Scientific tools for Python";