python.pkgs.h5py: fix for numpy 1.14
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, python, buildPythonPackage
|
||||
{ stdenv, fetchPypi, fetchpatch, python, buildPythonPackage
|
||||
, numpy, hdf5, cython, six, pkgconfig
|
||||
, mpi4py ? null, openssh }:
|
||||
|
||||
@@ -9,14 +9,12 @@ with stdenv.lib;
|
||||
let
|
||||
mpi = hdf5.mpi;
|
||||
mpiSupport = hdf5.mpiSupport;
|
||||
|
||||
in buildPythonPackage rec {
|
||||
version = "2.7.1";
|
||||
pname = "h5py";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/h/h5py/${name}.tar.gz";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "180a688311e826ff6ae6d3bda9b5c292b90b28787525ddfcb10a29d5ddcae2cc";
|
||||
};
|
||||
|
||||
@@ -34,11 +32,15 @@ in buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ hdf5 cython ]
|
||||
++ optional mpiSupport mpi
|
||||
;
|
||||
++ optional mpiSupport mpi;
|
||||
propagatedBuildInputs = [ numpy six]
|
||||
++ optionals mpiSupport [ mpi4py openssh ]
|
||||
;
|
||||
++ 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 =
|
||||
|
||||
Reference in New Issue
Block a user