diff options
Diffstat (limited to 'pkgs/development/python-modules/h5py/default.nix')
| -rw-r--r-- | pkgs/development/python-modules/h5py/default.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 54cfb5dc93ba..144e826b675d 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchPypi, fetchpatch, python, buildPythonPackage -, numpy, hdf5, cython, six, pkgconfig +{ stdenv, fetchPypi, fetchpatch, isPy27, python, buildPythonPackage +, numpy, hdf5, cython, six, pkgconfig, unittest2 , mpi4py ? null, openssh }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -10,12 +10,12 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "2.7.1"; + version = "2.8.0"; pname = "h5py"; src = fetchPypi { inherit pname version; - sha256 = "180a688311e826ff6ae6d3bda9b5c292b90b28787525ddfcb10a29d5ddcae2cc"; + sha256 = "0mdr6wrq02ac93m1aqx9kad0ppfzmm4imlxqgyy1x4l7hmdcc9p6"; }; configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi"; @@ -30,18 +30,13 @@ in buildPythonPackage rec { preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; + checkInputs = optional isPy27 unittest2; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ hdf5 cython ] ++ optional mpiSupport mpi; propagatedBuildInputs = [ numpy six] ++ optionals mpiSupport [ mpi4py openssh ]; - patches = [ - # Patch is based on upstream patch. The tox.ini hunk had to be removed. - # https://github.com/h5py/h5py/commit/5009e062a6f7d4e074cab0fcb42a780ac2b1d7d4.patch - ./numpy-1.14.patch - ]; - meta = { description = "Pythonic interface to the HDF5 binary data format"; |