summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index fc515ae5b5..aa6710a62d 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -280,6 +280,12 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
# Old trilinos fails with new CUDA (see #27180)
conflicts('@:13.0.1 +cuda', when='^cuda@11:')
+ # See discussion on the PR adding cuda@11.6 for details.
+ #
+ # https://github.com/spack/spack/pull/28439
+ #
+ conflicts('+cuda', when='^cuda@11.6.0:')
+
# stokhos fails on xl/xl_r
conflicts('+stokhos', when='%xl')
conflicts('+stokhos', when='%xl_r')