python h5py: 2.3.1 -> 2.5.0
Since I think 2.4 h5py introduced a new way to configure mpi. Therefore, the BuildFlags are removed. I built h5py and h5py-mpi packages successfully. Not sure though whether the mpi version does actually work correctly since I don't use it.
This commit is contained in:
parent
b42223f4dc
commit
a515e6e092
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchurl, python, buildPythonPackage
|
{ stdenv, fetchurl, python, buildPythonPackage
|
||||||
, numpy, hdf5, cython
|
, numpy, hdf5, cython, six, pkgconfig
|
||||||
, mpiSupport ? false, mpi4py ? null, mpi ? null }:
|
, mpiSupport ? false, mpi4py ? null, mpi ? null }:
|
||||||
|
|
||||||
assert mpiSupport == hdf5.mpiSupport;
|
assert mpiSupport == hdf5.mpiSupport;
|
||||||
@ -12,24 +12,26 @@ assert mpiSupport -> mpi != null
|
|||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
name = "h5py-2.3.1";
|
name = "h5py-${version}";
|
||||||
|
version = "2.5.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pypi.python.org/packages/source/h/h5py/${name}.tar.gz";
|
url = "https://pypi.python.org/packages/source/h/h5py/${name}.tar.gz";
|
||||||
md5 = "8f32f96d653e904d20f9f910c6d9dd91";
|
sha256 = "9833df8a679e108b561670b245bcf9f3a827b10ccb3a5fa1341523852cfac2f6";
|
||||||
};
|
};
|
||||||
|
|
||||||
setupPyBuildFlags = [ "--hdf5=${hdf5}" ]
|
configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi";
|
||||||
++ optional mpiSupport "--mpi"
|
|
||||||
;
|
postConfigure = ''
|
||||||
setupPyInstallFlags = setupPyBuildFlags;
|
${python.executable} setup.py configure ${configure_flags}
|
||||||
|
'';
|
||||||
|
|
||||||
preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
|
preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
|
||||||
|
|
||||||
buildInputs = [ hdf5 cython ]
|
buildInputs = [ hdf5 cython pkgconfig ]
|
||||||
++ optional mpiSupport mpi
|
++ optional mpiSupport mpi
|
||||||
;
|
;
|
||||||
propagatedBuildInputs = [ numpy ]
|
propagatedBuildInputs = [ numpy six]
|
||||||
++ optional mpiSupport mpi4py
|
++ optional mpiSupport mpi4py
|
||||||
;
|
;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user