Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

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.

+11 -9
+11 -9
pkgs/development/python-modules/h5py/default.nix
··· 1 { stdenv, fetchurl, python, buildPythonPackage 2 - , numpy, hdf5, cython 3 , mpiSupport ? false, mpi4py ? null, mpi ? null }: 4 5 assert mpiSupport == hdf5.mpiSupport; ··· 12 with stdenv.lib; 13 14 buildPythonPackage rec { 15 - name = "h5py-2.3.1"; 16 17 src = fetchurl { 18 url = "https://pypi.python.org/packages/source/h/h5py/${name}.tar.gz"; 19 - md5 = "8f32f96d653e904d20f9f910c6d9dd91"; 20 }; 21 22 - setupPyBuildFlags = [ "--hdf5=${hdf5}" ] 23 - ++ optional mpiSupport "--mpi" 24 - ; 25 - setupPyInstallFlags = setupPyBuildFlags; 26 27 preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; 28 29 - buildInputs = [ hdf5 cython ] 30 ++ optional mpiSupport mpi 31 ; 32 - propagatedBuildInputs = [ numpy ] 33 ++ optional mpiSupport mpi4py 34 ; 35
··· 1 { stdenv, fetchurl, python, buildPythonPackage 2 + , numpy, hdf5, cython, six, pkgconfig 3 , mpiSupport ? false, mpi4py ? null, mpi ? null }: 4 5 assert mpiSupport == hdf5.mpiSupport; ··· 12 with stdenv.lib; 13 14 buildPythonPackage rec { 15 + name = "h5py-${version}"; 16 + version = "2.5.0"; 17 18 src = fetchurl { 19 url = "https://pypi.python.org/packages/source/h/h5py/${name}.tar.gz"; 20 + sha256 = "9833df8a679e108b561670b245bcf9f3a827b10ccb3a5fa1341523852cfac2f6"; 21 }; 22 23 + configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi"; 24 + 25 + postConfigure = '' 26 + ${python.executable} setup.py configure ${configure_flags} 27 + ''; 28 29 preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; 30 31 + buildInputs = [ hdf5 cython pkgconfig ] 32 ++ optional mpiSupport mpi 33 ; 34 + propagatedBuildInputs = [ numpy six] 35 ++ optional mpiSupport mpi4py 36 ; 37