summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2016-11-14 12:22:21 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2016-11-14 12:31:05 +0100
commit05ca19c679d29749e7dbdc2fe6d2af005872102f (patch)
tree6dcea41f3910fbcbbd7fc9a707d4073515ce3066 /pkgs
parent5cfcbd89e91c1a43a9556ad065222e4f02155eb2 (diff)
downloadnixlib-05ca19c679d29749e7dbdc2fe6d2af005872102f.tar
nixlib-05ca19c679d29749e7dbdc2fe6d2af005872102f.tar.gz
nixlib-05ca19c679d29749e7dbdc2fe6d2af005872102f.tar.bz2
nixlib-05ca19c679d29749e7dbdc2fe6d2af005872102f.tar.lz
nixlib-05ca19c679d29749e7dbdc2fe6d2af005872102f.tar.xz
nixlib-05ca19c679d29749e7dbdc2fe6d2af005872102f.tar.zst
nixlib-05ca19c679d29749e7dbdc2fe6d2af005872102f.zip
pythonPackages.pycuda: 2016.1 -> 2016.1.2
and disable tests because they require an available cuda device.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/pycuda/default.nix26
1 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index d97a23746fd2..471ffbe6c354 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -1,4 +1,5 @@
 { buildPythonPackage 
+, fetchurl
 , fetchFromGitHub
 , boost
 , numpy
@@ -12,6 +13,7 @@
 , mkDerivation
 , stdenv
 , pythonOlder
+, isPy35
 }:
 let
   compyte = import ./compyte.nix {
@@ -19,22 +21,21 @@ let
   };
 in
 buildPythonPackage rec {
-  name = "pycuda-${version}"; 
-  version = "2016.1"; 
+  pname = "pycuda";
+  version = "2016.1.2";
+  name = "${pname}-${version}";
 
-  src = fetchFromGitHub {
-    owner = "inducer"; 
-    repo = "pycuda";
-    rev = "609817e22c038249f5e9ddd720b3ca5a9d58ca11"; 
-    sha256 = "0kg6ayxsw2gja9rqspy6z8ihacf9jnxr8hzywjwmj1izkv24cff7"; 
-  }; 
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "0dvf1cnrlvmrc7i100n2ndrnd7fjm7aq3wpmk2nx5h7hwb3xmnx7";
+  };
 
   preConfigure = ''
     findInputs ${boost.dev} boost_dirs propagated-native-build-inputs
 
     export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include
     export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib
-    
+
     ${python.interpreter} configure.py --boost-inc-dir=$BOOST_INCLUDEDIR \
                             --boost-lib-dir=$BOOST_LIBRARYDIR \
                             --no-use-shipped-boost \
@@ -45,7 +46,12 @@ buildPythonPackage rec {
     ln -s ${compyte} $out/${python.sitePackages}/pycuda/compyte 
   '';
 
-  doCheck = pythonOlder "3.5";
+  # Requires access to libcuda.so.1 which is provided by the driver
+  doCheck = false;
+
+  checkPhase = ''
+    py.test
+  '';
 
   propagatedBuildInputs = [
     numpy