summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/hdf5/package.py5
-rw-r--r--var/spack/repos/builtin/packages/pflotran/package.py3
2 files changed, 8 insertions, 0 deletions
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
@@ -46,6 +46,11 @@ class Hdf5(CMakePackage):
# Even versions are maintenance versions
version(
+ "1.14.1-2",
+ sha256="cbe93f275d5231df28ced9549253793e40cd2b555e3d288df09d7b89a9967b07",
+ preferred=True,
+ )
+ version(
"1.14.0",
sha256="a571cc83efda62e1a51a0a912dd916d01895801c5025af91669484a1575a6ef4",
preferred=True,
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"):