From 8bf170f280436cfdfda5ead492cf9ab5e04b4637 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Tue, 2 Jun 2015 10:58:17 -0500
Subject: [PATCH] Remove lingering dependence on atlas with numpy.

Closes https://github.com/NixOS/nixpkgs/pull/8133.
---
 pkgs/development/python-modules/numpy-scipy-support.nix | 5 ++++-
 pkgs/top-level/python-packages.nix                      | 2 +-
 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 6cca704dcda..22be22633c2 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 fa01d1ef488..a5ad7e46f4f 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";