Skip to content

Commit

Permalink
pythonPackages.h5py: 2.7.1 -> 2.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jluttine committed Jun 7, 2018
1 parent a073f26 commit 083300e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 104 deletions.
15 changes: 5 additions & 10 deletions 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;
Expand All @@ -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";
Expand All @@ -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";
Expand Down
94 changes: 0 additions & 94 deletions pkgs/development/python-modules/h5py/numpy-1.14.patch

This file was deleted.

0 comments on commit 083300e

Please sign in to comment.