summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAllen Nelson <anelson@narrativescience.com>2015-06-02 10:58:17 -0500
committerPeter Simons <simons@cryp.to>2015-06-04 20:07:41 +0200
commit8bf170f280436cfdfda5ead492cf9ab5e04b4637 (patch)
treea3fca1a7ecf81fdc3747acf3f4835197023e9efc /pkgs
parentf1587a2d1ecfebdf9a8b20c2408adfec8806f879 (diff)
downloadnixlib-8bf170f280436cfdfda5ead492cf9ab5e04b4637.tar
nixlib-8bf170f280436cfdfda5ead492cf9ab5e04b4637.tar.gz
nixlib-8bf170f280436cfdfda5ead492cf9ab5e04b4637.tar.bz2
nixlib-8bf170f280436cfdfda5ead492cf9ab5e04b4637.tar.lz
nixlib-8bf170f280436cfdfda5ead492cf9ab5e04b4637.tar.xz
nixlib-8bf170f280436cfdfda5ead492cf9ab5e04b4637.tar.zst
nixlib-8bf170f280436cfdfda5ead492cf9ab5e04b4637.zip
Remove lingering dependence on atlas with numpy.
Closes https://github.com/NixOS/nixpkgs/pull/8133.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/numpy-scipy-support.nix5
-rw-r--r--pkgs/top-level/python-packages.nix2
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix
index 6cca704dcdae..22be22633c20 100644
--- a/pkgs/development/python-modules/numpy-scipy-support.nix
+++ b/pkgs/development/python-modules/numpy-scipy-support.nix
@@ -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
   # .test() function, which will run the test suite.
@@ -40,7 +43,7 @@
     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.
   preBuild = ''
     echo "Creating site.cfg file..."
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fa01d1ef4888..a5ad7e46f4f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7821,7 +7821,7 @@ let
     setupPyBuildFlags = ["--fcompiler='gnu95'"];
 
     buildInputs = [ pkgs.gfortran self.nose ];
-    propagatedBuildInputs = [ pkgs.atlas ];
+    propagatedBuildInputs = [ support.atlas ];
 
     meta = {
       description = "Scientific tools for Python";