From 16478834f4c19c2b3df99b7e130f7df89215ef0e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Oct 2024 16:43:08 +0200 Subject: [PATCH 1/2] hdf5: 1.14.4.3 -> 1.14.5 --- pkgs/tools/misc/hdf5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 80f7c151bf95..e88f591128f6 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -28,7 +28,7 @@ assert !cppSupport || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.14.4.3"; + version = "1.14.5"; pname = "hdf5" + lib.optionalString cppSupport "-cpp" + lib.optionalString fortranSupport "-fortran" @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { owner = "HDFGroup"; repo = "hdf5"; rev = "hdf5_${version}"; - hash = "sha256-lvz3x04SS0oZmUn/BIxQEHnugaDOws46kfT3NAw7Hos="; + hash = "sha256-bvtSeyqqrBXVAMzUtiKOhO9RR4SCO+3GnsLux4Mig6I="; }; passthru = { From bc23fc41e477654dc25e6faa8dea7a26105aa15e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 7 Oct 2024 15:35:50 +0200 Subject: [PATCH 2/2] pdi: fix HDF5 version detection Allow for 3 and 4 digit version string. HDF5 likes to skip between them. --- pkgs/by-name/pd/pdi/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pd/pdi/package.nix b/pkgs/by-name/pd/pdi/package.nix index 7159af6a03ae..519b72594a10 100644 --- a/pkgs/by-name/pd/pdi/package.nix +++ b/pkgs/by-name/pd/pdi/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # Patch it to make it match a 4 number-long version. postPatch = '' substituteInPlace plugins/decl_hdf5/cmake/FindHDF5.cmake \ - --replace-fail '"H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+)' '"H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)' + --replace-fail '"H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+)' '"H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+(\\.[0-9]+)*)' ''; nativeBuildInputs = [