From 2c3d6111a26cce74becdc89335d65d3f7839a58c Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 21 Jan 2026 16:01:51 -0600 Subject: [PATCH 1/3] chore: geant4-11.4.0.east --- spack-environment/packages.yaml | 6 +++--- spack-packages.sh | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 8ef8197b..93997034 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -81,7 +81,7 @@ packages: - -shared clhep: require: - - '@2.4.7.1' + - '@2.4.7.2' - cxxstd=20 cli11: require: @@ -184,8 +184,8 @@ packages: prefix: /opt/software/externals/g4ndl geant4: require: - - '@11.3.2.east' - - cxxstd=20 -vecgeom +threads -timemory -vtk + - '@11.4.0.east' + - cxxstd=20 -vecgeom +threads -vtk - any_of: [+opengl +qt +x11, -opengl -qt -x11] gettext: require: diff --git a/spack-packages.sh b/spack-packages.sh index a6220f3e..f3b4807c 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -39,6 +39,9 @@ b9ad19ee2ce47f8b7fbe187d41d898f873bbc121 58593e5d028737fef024c8136045b9d3f988e3e3 e87325e40627e4113c5e374f83e086f2421e005a a1437186c1d979ce112d52be178d0fb88b70f332 +bf324ce8df932ae55701fc7e7d46ae835583654f +d9c75526e8e218806c331d19e5d0a3a5ddc37afb +bacfc0e267518496447810d77ed2e477ee32f7d5 --- ## Optional hash table with comma-separated file list ## For these commits, the cherry-pick will be restricted to the listed files only. @@ -77,3 +80,6 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 58593e5d028737fef024c8136045b9d3f988e3e3: py-onnxruntime: patch to add linker flag -z noexecstack ## e87325e40627e4113c5e374f83e086f2421e005a: acts: add v44.4.0 ## a1437186c1d979ce112d52be178d0fb88b70f332: acts: narrow when range on podio when +edm4hep +examples +## bf324ce8df932ae55701fc7e7d46ae835583654f: clhep: use the blessed Gitlab instance instead of proj-clhep.web.cern.ch +## d9c75526e8e218806c331d19e5d0a3a5ddc37afb: geant4: disable the timemory variant starting with 11.3.0 +## bacfc0e267518496447810d77ed2e477ee32f7d5: geant4: add v11.4.0 and versions of other packages needed From 8f0b1e413e05de3257eb8ee700b2077c2ee82626 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 21 Jan 2026 18:08:18 -0600 Subject: [PATCH 2/3] fix: eic-spack: geant4: add v11.4.0.east --- eic-spack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eic-spack.sh b/eic-spack.sh index d0e1f66e..2b9d4070 100644 --- a/eic-spack.sh +++ b/eic-spack.sh @@ -3,4 +3,4 @@ EICSPACK_ORGREPO="eic/eic-spack" ## EIC spack commit hash or github version, e.g. v0.19.7 ## note: nightly builds could use a branch e.g. releases/v0.19 -EICSPACK_VERSION="8e231cc01baa7b4cdc285671e5fa4e92d2d35547" +EICSPACK_VERSION="f16193d67aa36aab9c773590f5998ae47d9ba4b0" From 579dc3bc8a09bb32543e6bfb5c4ecc70268d185c Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 22 Jan 2026 15:28:40 -0600 Subject: [PATCH 3/3] fix: add more external geant4-data packages --- spack-environment/packages_cvmfs_geant4data.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/spack-environment/packages_cvmfs_geant4data.yaml b/spack-environment/packages_cvmfs_geant4data.yaml index 865b0b02..b630461f 100644 --- a/spack-environment/packages_cvmfs_geant4data.yaml +++ b/spack-environment/packages_cvmfs_geant4data.yaml @@ -9,11 +9,17 @@ packages: g4channeling: buildable: False externals: + - spec: g4channeling@2.0 + prefix: /cvmfs/geant4.cern.ch - spec: g4channeling@1.0 prefix: /cvmfs/geant4.cern.ch g4emlow: buildable: False externals: + - spec: g4emlow@8.8 + prefix: /cvmfs/geant4.cern.ch + - spec: g4emlow@8.7 + prefix: /cvmfs/geant4.cern.ch - spec: g4emlow@8.6.1 prefix: /cvmfs/geant4.cern.ch g4ensdfstate: @@ -24,6 +30,8 @@ packages: g4incl: buildable: False externals: + - spec: g4incl@1.3 + prefix: /cvmfs/geant4.cern.ch - spec: g4incl@1.2 prefix: /cvmfs/geant4.cern.ch g4ndl: @@ -39,11 +47,17 @@ packages: g4particlexs: buildable: False externals: + - spec: g4particlexs@4.2 + prefix: /cvmfs/geant4.cern.ch - spec: g4particlexs@4.1 prefix: /cvmfs/geant4.cern.ch g4photonevaporation: buildable: False externals: + - spec: g4photonevaporation@6.1.2 + prefix: /cvmfs/geant4.cern.ch + - spec: g4photonevaporation@6.1.1 + prefix: /cvmfs/geant4.cern.ch - spec: g4photonevaporation@6.1 prefix: /cvmfs/geant4.cern.ch g4pii: