From 79d79969bb4a5b80433dc3b73f471052a6281dc7 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 8 Dec 2024 08:12:14 -0600 Subject: [PATCH] celeritas: patch 0.5.0 for geant4@11.3.0: (#47976) --- var/spack/repos/builtin/packages/celeritas/package.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/var/spack/repos/builtin/packages/celeritas/package.py b/var/spack/repos/builtin/packages/celeritas/package.py index b0e605ffc3c..a88df0ed6a8 100644 --- a/var/spack/repos/builtin/packages/celeritas/package.py +++ b/var/spack/repos/builtin/packages/celeritas/package.py @@ -96,6 +96,16 @@ class Celeritas(CMakePackage, CudaPackage, ROCmPackage): conflicts("+rocm", when="+cuda", msg="AMD and NVIDIA accelerators are incompatible") conflicts("+rocm", when="+vecgeom", msg="HIP support is only available with ORANGE") + # geant4@11.3.0 now returns const G4Element::GetElementTable() + patch( + "https://github.com/celeritas-project/celeritas/commit/3c8ed9614fc695fba35e8a058bedb7bc1556f71c.patch?full_index=1", + sha256="1161c4f1166860d35d2a3f103236a63acd6a35aee2d2c27561cb929941d1c170", + when="@0.5.0 +geant4 ^geant4@11.3.0:", + ) + conflicts( + "^geant4@11.3.0:", when="@:0.4 +geant4", msg="geant4@11.3.0: requires at least 0.5.0" + ) + def cmake_args(self): define = self.define from_variant = self.define_from_variant