Merge pull request NixOS#218705 from gebner/medfile-hdf5-114

medfile: build with hdf5 1.14
kalbasit · Feb 28, 2023 · 8d38e23 · 8d38e23
2 parents 3bc99d8 + ce83a0c
commit 8d38e23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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/...lopment/libraries/medfile/hdf5-1.12.patch → ...lopment/libraries/medfile/hdf5-1.14.patch b/...lopment/libraries/medfile/hdf5-1.12.patch → ...lopment/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 ) ) {