mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-15 02:03:01 +00:00
Merge pull request #250609 from markuskowa/upd-hdf5
hdf5: 1.14.1-2 -> 1.14.2
This commit is contained in:
commit
ccf6b469cb
@ -26,7 +26,7 @@ assert !cppSupport || !mpiSupport;
|
||||
let inherit (lib) optional optionals; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.14.1-2";
|
||||
version = "1.14.2";
|
||||
pname = "hdf5"
|
||||
+ lib.optionalString cppSupport "-cpp"
|
||||
+ lib.optionalString fortranSupport "-fortran"
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
majorMinor = lib.versions.majorMinor version;
|
||||
majorMinorPatch = with lib.versions; "${major version}.${minor version}.${patch version}";
|
||||
in "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${majorMinor}/hdf5-${majorMinorPatch}/src/hdf5-${version}.tar.bz2";
|
||||
sha256 = "sha256-BsoUHRo8MStdfMSCahJzcpOuExAxdIhhaJ9qLsghnb0=";
|
||||
sha256 = "sha256-6jxeJX7zIq9ed/weUurTrWvzu0rAZIDdF+45ANeiTPs=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
@ -94,18 +94,6 @@ stdenv.mkDerivation rec {
|
||||
moveToOutput 'bin/h5pcc' "''${!outputDev}"
|
||||
'';
|
||||
|
||||
# Remove reference to /build, which get introduced
|
||||
# into AM_CPPFLAGS since hdf5-1.14.0. Cmake of various
|
||||
# packages using HDF5 gets confused trying access the non-existent path.
|
||||
postFixup = ''
|
||||
for i in h5cc h5pcc h5c++; do
|
||||
if [ -f $dev/bin/$i ]; then
|
||||
substituteInPlace $dev/bin/$i --replace \
|
||||
'-I/build/hdf5-${version}/src/H5FDsubfiling' ""
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests = {
|
||||
|
Loading…
Reference in New Issue
Block a user