From bc41a7d55139c12acc9fc9005183963bfedf145d Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Thu, 16 Jun 2016 00:03:07 +0200
Subject: [PATCH] switch to the default versions of numpy and scipy in
 libgpuarray-cuda

---
 .../python-modules/libgpuarray/cuda/default.nix          | 9 +--------
 pkgs/top-level/python-packages.nix                       | 3 +--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/libgpuarray/cuda/default.nix b/pkgs/development/python-modules/libgpuarray/cuda/default.nix
index 6934d9bfe6f..91dfb9b625b 100644
--- a/pkgs/development/python-modules/libgpuarray/cuda/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/cuda/default.nix
@@ -18,14 +18,7 @@
 , python
 , cudatoolkit
 , nvidia_x11
-, setuptools
 }: 
-let
-  scipy_numpy = scipy.override (let inherit numpy; in {
-    passthru = { blas = numpy.blas; };
-    propagatedBuildInputs = [ numpy.blas numpy ] ++ [ python setuptools ];
-  });
-in
 buildPythonPackage rec {
   name = "libgpuarray-cuda-${version}";
   version = "-9998.0"; 
@@ -104,7 +97,7 @@ EOF
 
   propagatedBuildInputs = [
     numpy
-    scipy_numpy
+    scipy
     nose
     six
     Mako
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 13154ea57e3..47677113ae9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11891,8 +11891,7 @@ in modules // {
   });
 
   libgpuarray-cuda = callPackage ../development/python-modules/libgpuarray/cuda/default.nix rec {
-    numpy = self.numpy_1_10;
-    inherit (self) scipy;
+    inherit (self) numpy scipy;
     inherit (pkgs.linuxPackages) nvidia_x11;
     cudatoolkit = pkgs.cudatoolkit75;
     clblas = pkgs.clblas-cuda;