From c2968b4d8cc05ea70941d7c02088701aff39d6b4 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Fri, 12 May 2023 19:54:08 -0500 Subject: Add HDF5 version 1.14.1 (#37579) * Add HDF5 version 1.14.1 * Update to version HDF5 1.14.1-2. --- var/spack/repos/builtin/packages/hdf5/package.py | 5 +++++ var/spack/repos/builtin/packages/pflotran/package.py | 3 +++ 2 files changed, 8 insertions(+) diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 36b5b87aa6..4efba18d87 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -45,6 +45,11 @@ class Hdf5(CMakePackage): version("1.13.2", sha256="01643fa5b37dba7be7c4db6bbf3c5d07adf5c1fa17dbfaaa632a279b1b2f06da") # Even versions are maintenance versions + version( + "1.14.1-2", + sha256="cbe93f275d5231df28ced9549253793e40cd2b555e3d288df09d7b89a9967b07", + preferred=True, + ) version( "1.14.0", sha256="a571cc83efda62e1a51a0a912dd916d01895801c5025af91669484a1575a6ef4", diff --git a/var/spack/repos/builtin/packages/pflotran/package.py b/var/spack/repos/builtin/packages/pflotran/package.py index e96bd98c7b..0045f27588 100644 --- a/var/spack/repos/builtin/packages/pflotran/package.py +++ b/var/spack/repos/builtin/packages/pflotran/package.py @@ -37,6 +37,9 @@ class Pflotran(AutotoolsPackage): depends_on("petsc@3.10:+hdf5+metis", when="@xsdk-0.4.0") depends_on("petsc@3.8.0:+hdf5+metis", when="@xsdk-0.3.0") + # https://github.com/spack/spack/pull/37579#issuecomment-1545998141 + conflicts("^hdf5@1.14.1", when="%oneapi") + def build(self, spec, prefix): if spec.satisfies("+rxn"): with working_dir("src/pflotran"): -- cgit v1.2.3-60-g2f50