make clblas-cuda and libgpuarray-cuda more functorial

pkgs/development/python-modules/libgpuarray/cuda/default.nix

@@ -18,8 +18,14 @@
 , 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"; 
@@ -98,7 +104,7 @@ EOF
 
   propagatedBuildInputs = [
     numpy
-    scipy
+    scipy_numpy
     nose
     six
     Mako

pkgs/top-level/all-packages.nix

@@ -1550,8 +1550,6 @@ in
 
   libbladeRF = callPackage ../development/libraries/libbladeRF { };
 
-  libgpuarray-cuda = python34Packages.libgpuarray-cuda;
-
   lp_solve = callPackage ../applications/science/math/lp_solve { };
 
   lprof = callPackage ../tools/graphics/lprof { };
@@ -15950,10 +15948,6 @@ in
   clblas-cuda = callPackage ../development/libraries/science/math/clblas/cuda {
     cudatoolkit = pkgs.cudatoolkit75;
     inherit (linuxPackages) nvidia_x11;
-    python = pkgs.python34Packages.python;
-    boost = pkgs.boost159.override {
-      inherit python;
-    };
   };
 
   jags = callPackage ../applications/science/math/jags { };

pkgs/top-level/python-packages.nix

@@ -11892,14 +11892,7 @@ in modules // {
 
   libgpuarray-cuda = callPackage ../development/python-modules/libgpuarray/cuda/default.nix rec {
     numpy = self.numpy_1_10;
-    scipy = self.buildScipyPackage rec {
-      version = "0.17.1";
-      src = pkgs.fetchurl {
-        url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz";
-        sha256 = "1b1qpfz2j2rvmlplsjbnznnxnqr9ckbmis506110ii1w07wd4k4w";
-      };
-      inherit numpy;
-    };
+    inherit (self) scipy;
     inherit (pkgs.linuxPackages) nvidia_x11;
     cudatoolkit = pkgs.cudatoolkit75;
     clblas = pkgs.clblas-cuda;