diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2023-02-27 17:31:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-27 17:31:21 -0800 |
| commit | 8d38e239668396b787d838d8605a524d539c0114 (patch) | |
| tree | ee06405794dbcb4f632a32ebe568ef8dfb56c70a | |
| parent | 3bc99d82aa0f6230e2dbcba5a57bf57dd50acad4 (diff) | |
| parent | ce83a0c11c149cacaf708cd44e69487293ccf671 (diff) | |
| download | nixpkgs-8d38e239668396b787d838d8605a524d539c0114.tar nixpkgs-8d38e239668396b787d838d8605a524d539c0114.tar.gz nixpkgs-8d38e239668396b787d838d8605a524d539c0114.tar.bz2 nixpkgs-8d38e239668396b787d838d8605a524d539c0114.tar.lz nixpkgs-8d38e239668396b787d838d8605a524d539c0114.tar.xz nixpkgs-8d38e239668396b787d838d8605a524d539c0114.tar.zst nixpkgs-8d38e239668396b787d838d8605a524d539c0114.zip | |
Merge pull request #218705 from gebner/medfile-hdf5-114
medfile: build with hdf5 1.14
| -rw-r--r-- | pkgs/development/libraries/medfile/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/medfile/hdf5-1.14.patch (renamed from pkgs/development/libraries/medfile/hdf5-1.12.patch) | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 1ef091a5d85..9593781f227 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patches = [ - ./hdf5-1.12.patch + ./hdf5-1.14.patch ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/medfile/hdf5-1.12.patch b/pkgs/development/libraries/medfile/hdf5-1.14.patch index ab73e00487c..294e87c023a 100644 --- a/pkgs/development/libraries/medfile/hdf5-1.12.patch +++ b/pkgs/development/libraries/medfile/hdf5-1.14.patch @@ -25,7 +25,7 @@ #error "Don't forget to update the test version here when you change the major version of the library !" #endif -#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 ++#if H5_VERS_MINOR > 14 #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !" #error "Cf. _MEDfileCreate ..." #endif @@ -36,7 +36,7 @@ * Un test autoconf permet de fixer un intervalle de version HDF à MED. */ -#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 ++#if H5_VERS_MINOR > 14 #error "Don't forget to change the compatibility version of the library !" #endif @@ -47,7 +47,7 @@ • The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). */ -#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 ++#if H5_VERS_MINOR > 14 #error "Don't forget to change the compatibility version of the library !" #endif /* L'avantage de bloquer le modèle interne HDF5 @@ -58,7 +58,7 @@ } -#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 ++#if H5_VERS_MINOR > 14 #error "Don't forget to change the compatibility version of the library !" #endif if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) { @@ -69,7 +69,7 @@ * Un test autoconf permet de fixer un intervalle de version HDF à MED. */ -#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 ++#if H5_VERS_MINOR > 14 #error "Don't forget to change the compatibility version of the library !" #endif @@ -80,7 +80,7 @@ goto ERROR; } -#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 ++#if H5_VERS_MINOR > 14 #error "Don't forget to change the compatibility version of the library !" #endif if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) { |