diff options
| author | artuuge <artuuge@gmail.com> | 2016-06-16 00:03:07 +0200 |
|---|---|---|
| committer | artuuge <artuuge@gmail.com> | 2016-06-16 00:03:07 +0200 |
| commit | bc41a7d55139c12acc9fc9005183963bfedf145d (patch) | |
| tree | 7277eec038bf55f2b4be3de1be00c5656384727b /pkgs/development | |
| parent | d1f38e2adcc78cfb17f2d60c0c63dd597b3e5c90 (diff) | |
| download | nixlib-bc41a7d55139c12acc9fc9005183963bfedf145d.tar nixlib-bc41a7d55139c12acc9fc9005183963bfedf145d.tar.gz nixlib-bc41a7d55139c12acc9fc9005183963bfedf145d.tar.bz2 nixlib-bc41a7d55139c12acc9fc9005183963bfedf145d.tar.lz nixlib-bc41a7d55139c12acc9fc9005183963bfedf145d.tar.xz nixlib-bc41a7d55139c12acc9fc9005183963bfedf145d.tar.zst nixlib-bc41a7d55139c12acc9fc9005183963bfedf145d.zip | |
switch to the default versions of numpy and scipy in libgpuarray-cuda
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/python-modules/libgpuarray/cuda/default.nix | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/libgpuarray/cuda/default.nix b/pkgs/development/python-modules/libgpuarray/cuda/default.nix index 6934d9bfe6f4..91dfb9b625b9 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 |