Skip to content

Commit

Permalink
Merge pull request NixOS#250609 from markuskowa/upd-hdf5
Browse files Browse the repository at this point in the history
hdf5: 1.14.1-2 -> 1.14.2
  • Loading branch information
markuskowa authored Aug 25, 2023
2 parents 478d38e + bae6f63 commit ccf6b46
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions pkgs/tools/misc/hdf5/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand Down

0 comments on commit ccf6b46

Please sign in to comment.