From b894acf1fca8eb5cc52d2267b0c4c187065998c0 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 25 Jun 2024 13:35:31 -0500 Subject: [PATCH] geant4: add v11.2.2, incl g4ndl v4.7.1 (#44830) * geant4: add v11.2.2 * g4ndl: add v4.7.1 * geant4-data, g4ndl: use =4.7 for 11.2.0:11.2.1, 4.7.1 for 11.2.2 --- .../repos/builtin/packages/g4ndl/package.py | 1 + .../builtin/packages/geant4-data/package.py | 18 ++++++++++++++++-- .../repos/builtin/packages/geant4/package.py | 4 +++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/g4ndl/package.py b/var/spack/repos/builtin/packages/g4ndl/package.py index be9f298c2f8..a8c8f688985 100644 --- a/var/spack/repos/builtin/packages/g4ndl/package.py +++ b/var/spack/repos/builtin/packages/g4ndl/package.py @@ -17,6 +17,7 @@ class G4ndl(Package): maintainers("drbenmorgan") + version("4.7.1", sha256="d3acae48622118d2579de24a54d533fb2416bf0da9dd288f1724df1485a46c7c") version("4.7", sha256="7e7d3d2621102dc614f753ad928730a290d19660eed96304a9d24b453d670309") version("4.6", sha256="9d287cf2ae0fb887a2adce801ee74fb9be21b0d166dab49bcbee9408a5145408") version("4.5", sha256="cba928a520a788f2bc8229c7ef57f83d0934bb0c6a18c31ef05ef4865edcdf8e") diff --git a/var/spack/repos/builtin/packages/geant4-data/package.py b/var/spack/repos/builtin/packages/geant4-data/package.py index c4134e356a9..49d15e83ffe 100644 --- a/var/spack/repos/builtin/packages/geant4-data/package.py +++ b/var/spack/repos/builtin/packages/geant4-data/package.py @@ -18,6 +18,7 @@ class Geant4Data(BundlePackage): tags = ["hep"] + version("11.2.2") version("11.2.0") version("11.1.0") version("11.0.0") @@ -43,8 +44,21 @@ class Geant4Data(BundlePackage): # they generally don't change on the patch level # Can move to declaring on a dataset basis if needed _datasets = { - "11.2.0:11.2": [ - "g4ndl@4.7", + "11.2.2:11.2": [ + "g4ndl@4.7.1", + "g4emlow@8.5", + "g4photonevaporation@5.7", + "g4radioactivedecay@5.6", + "g4particlexs@4.0", + "g4pii@1.3", + "g4realsurface@2.2", + "g4saiddata@2.0", + "g4abla@3.3", + "g4incl@1.2", + "g4ensdfstate@2.3", + ], + "11.2.0:11.2.1": [ + "g4ndl@=4.7", "g4emlow@8.5", "g4photonevaporation@5.7", "g4radioactivedecay@5.6", diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py index 9a399e0900a..66947fb45f2 100644 --- a/var/spack/repos/builtin/packages/geant4/package.py +++ b/var/spack/repos/builtin/packages/geant4/package.py @@ -22,6 +22,7 @@ class Geant4(CMakePackage): maintainers("drbenmorgan", "sethrj") + version("11.2.2", sha256="3a8d98c63fc52578f6ebf166d7dffaec36256a186d57f2520c39790367700c8d") version("11.2.1", sha256="76c9093b01128ee2b45a6f4020a1bcb64d2a8141386dea4674b5ae28bcd23293") version("11.2.0", sha256="9ff544739b243a24dac8f29a4e7aab4274fc0124fd4e1c4972018213dc6991ee") version("11.1.3", sha256="5d9a05d4ccf8b975649eab1d615fc1b8dce5937e01ab9e795bffd04149240db6") @@ -93,7 +94,8 @@ class Geant4(CMakePackage): "10.7.4", "11.0", "11.1", - "11.2:", + "11.2.0:11.2.1", + "11.2.2:", ]: depends_on("geant4-data@" + _vers, type="run", when="@" + _vers)