From bae6f6346fba0adf6cfccf427ebc06ef7549c0b0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 21 Aug 2023 22:22:57 +0200 Subject: [PATCH] hdf5: 1.14.1-2 -> 1.14.2 --- pkgs/tools/misc/hdf5/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 1dc0eda83f67..3c9c6169192d 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -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 = {