From 63dd78101cbd1a967906488363dacfd9efd7459b Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 17 Feb 2026 13:22:44 -0600 Subject: [PATCH 1/6] chore: acts-45.0.0 --- spack-environment/packages.yaml | 2 +- spack-packages.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 08dd64ca..6bd8c973 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -32,7 +32,7 @@ packages: - cxxstd=17 acts: require: - - '@44.4.0' + - '@45.0.0' - cxxstd=20 +dd4hep +edm4hep +examples +fatras +geant4 +json +onnx +podio +python +svg +tgeo +pr4496 +pr4502 +pr4620 # ACTS requires same compiler as DD4hep since compiler options are reused - spec: '%gcc' diff --git a/spack-packages.sh b/spack-packages.sh index 4576c81b..7a9d1338 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -48,6 +48,7 @@ cfa8d650480c409de2d568cf1355bf7e509f4c1c 688d5e5e20fa9aa2647026143205c8aaa0625590 b2f469de6a7c823bf93b9fa408b0ef4b67442f5f 3368f8849e57da0ad1eaa0086b1855538e5db03e +090c7437cff0352a9d69b9b9c6c9f60a4600862f 5ec7462a628681522f8cf6016a9aa72fbd40dd91 --- ## Optional hash table with comma-separated file list @@ -97,4 +98,5 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 688d5e5e20fa9aa2647026143205c8aaa0625590: dd4hep: add v1.35 ## b2f469de6a7c823bf93b9fa408b0ef4b67442f5f: py-snakemake-storage-plugin-rucio: add v0.4.1 ## 3368f8849e57da0ad1eaa0086b1855538e5db03e: just: add 1.46.0 +## 090c7437cff0352a9d69b9b9c6c9f60a4600862f: acts: add v45.0.0 ## 5ec7462a628681522f8cf6016a9aa72fbd40dd91: arrow: add 20.0.0, 21.0.0, 22.0.0 From f83fb91346ae6fbb2c83a74f42f54594e962f746 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 18 Feb 2026 15:35:48 -0600 Subject: [PATCH 2/6] chore: acts-45.1.1 --- spack-environment/packages.yaml | 2 +- spack-packages.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 6bd8c973..df70357f 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -32,7 +32,7 @@ packages: - cxxstd=17 acts: require: - - '@45.0.0' + - '@45.1.1' - cxxstd=20 +dd4hep +edm4hep +examples +fatras +geant4 +json +onnx +podio +python +svg +tgeo +pr4496 +pr4502 +pr4620 # ACTS requires same compiler as DD4hep since compiler options are reused - spec: '%gcc' diff --git a/spack-packages.sh b/spack-packages.sh index 7a9d1338..fec8d1d1 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -49,6 +49,8 @@ cfa8d650480c409de2d568cf1355bf7e509f4c1c b2f469de6a7c823bf93b9fa408b0ef4b67442f5f 3368f8849e57da0ad1eaa0086b1855538e5db03e 090c7437cff0352a9d69b9b9c6c9f60a4600862f +58597d3567384cb7be500b336c5c4edabb343be7 +4b77ca9bd1e6e828ea2c6027bca817cb82d8ac61 5ec7462a628681522f8cf6016a9aa72fbd40dd91 --- ## Optional hash table with comma-separated file list @@ -99,4 +101,6 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## b2f469de6a7c823bf93b9fa408b0ef4b67442f5f: py-snakemake-storage-plugin-rucio: add v0.4.1 ## 3368f8849e57da0ad1eaa0086b1855538e5db03e: just: add 1.46.0 ## 090c7437cff0352a9d69b9b9c6c9f60a4600862f: acts: add v45.0.0 +## 58597d3567384cb7be500b336c5c4edabb343be7: acts: add v45.1.0 and v45.1.1 +## 4b77ca9bd1e6e828ea2c6027bca817cb82d8ac61: acts: improve variant dependency handling ## 5ec7462a628681522f8cf6016a9aa72fbd40dd91: arrow: add 20.0.0, 21.0.0, 22.0.0 From fa749d5a5711bd99e9139bfc3f44a6cf488eb8a7 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 19 Feb 2026 07:30:17 -0600 Subject: [PATCH 3/6] fix: spack cherry-pick: acts: remove "build" type from some dependencies --- spack-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack-packages.sh b/spack-packages.sh index fec8d1d1..ca554121 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -45,6 +45,7 @@ cfa8d650480c409de2d568cf1355bf7e509f4c1c 50433a4a02370e9035b85820cd438a64d5433749 9686af7a77fb96d177a825c9ea2343ed15512d75 6eeb0dd820467e5542d41d6784ee86de8f84d4a0 +0bb3f0cf0f8f22b5a12286d744355ac85263f600 688d5e5e20fa9aa2647026143205c8aaa0625590 b2f469de6a7c823bf93b9fa408b0ef4b67442f5f 3368f8849e57da0ad1eaa0086b1855538e5db03e @@ -97,6 +98,7 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 50433a4a02370e9035b85820cd438a64d5433749: python ecosystem: bulk update ## 9686af7a77fb96d177a825c9ea2343ed15512d75: snakemake: add v9 versions and dependencies ## 6eeb0dd820467e5542d41d6784ee86de8f84d4a0: py-snakemake-storage-plugin-fs: add v1.1.3 +## 0bb3f0cf0f8f22b5a12286d744355ac85263f600: acts: remove "build" type from some dependencies ## 688d5e5e20fa9aa2647026143205c8aaa0625590: dd4hep: add v1.35 ## b2f469de6a7c823bf93b9fa408b0ef4b67442f5f: py-snakemake-storage-plugin-rucio: add v0.4.1 ## 3368f8849e57da0ad1eaa0086b1855538e5db03e: just: add 1.46.0 From 93b9ee988da6a4d860620e68e91220ff5233d25b Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 19 Feb 2026 07:34:06 -0600 Subject: [PATCH 4/6] fix: spack cherry-pick: acts: rename "tgeo" variant to "root" --- spack-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack-packages.sh b/spack-packages.sh index ca554121..b852eee1 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -39,6 +39,7 @@ b9ad19ee2ce47f8b7fbe187d41d898f873bbc121 5f36a2b536a22ea3692bfdcd48a6c0c71e6488cf 58593e5d028737fef024c8136045b9d3f988e3e3 e87325e40627e4113c5e374f83e086f2421e005a +d0977a5f941bc01833c923b99a88e53c4be0f04c a1437186c1d979ce112d52be178d0fb88b70f332 cfa8d650480c409de2d568cf1355bf7e509f4c1c 580bdd5b82e9329a4b5c0b30411e43ea3221d958 @@ -92,6 +93,7 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 5f36a2b536a22ea3692bfdcd48a6c0c71e6488cf: py-onnxruntime: add v1.21.1, v1.22.2 ## 58593e5d028737fef024c8136045b9d3f988e3e3: py-onnxruntime: patch to add linker flag -z noexecstack ## e87325e40627e4113c5e374f83e086f2421e005a: acts: add v44.4.0 +## d0977a5f941bc01833c923b99a88e53c4be0f04c: acts: rename "tgeo" variant to "root" ## a1437186c1d979ce112d52be178d0fb88b70f332: acts: narrow when range on podio when +edm4hep +examples ## cfa8d650480c409de2d568cf1355bf7e509f4c1c: dd4hep: Add version 1.34 ## 580bdd5b82e9329a4b5c0b30411e43ea3221d958: pythia8: add v8.316 From 035b721005e5031a41d256a33d525f442530dd03 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 19 Feb 2026 10:13:33 -0600 Subject: [PATCH 5/6] fix: acts +tgeo -> +root --- spack-environment/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index df70357f..1f858d04 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -33,7 +33,7 @@ packages: acts: require: - '@45.1.1' - - cxxstd=20 +dd4hep +edm4hep +examples +fatras +geant4 +json +onnx +podio +python +svg +tgeo +pr4496 +pr4502 +pr4620 + - cxxstd=20 +dd4hep +edm4hep +examples +fatras +geant4 +json +onnx +podio +python +svg +root +pr4496 +pr4502 +pr4620 # ACTS requires same compiler as DD4hep since compiler options are reused - spec: '%gcc' when: '^dd4hep %gcc' From 6186738a90bf3304368fabf841d15ceb530027c0 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 2 Mar 2026 07:57:32 -0600 Subject: [PATCH 6/6] fix: key4hep-spack: k4actstracking: don't depend on acts +tgeo --- key4hep-spack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/key4hep-spack.sh b/key4hep-spack.sh index 62dce805..d9d602ca 100644 --- a/key4hep-spack.sh +++ b/key4hep-spack.sh @@ -3,4 +3,4 @@ KEY4HEPSPACK_ORGREPO="key4hep/key4hep-spack" ## Key4HEP spack commit hash or github version, e.g. v0.19.7 ## note: nightly builds could use a branch e.g. releases/v0.19 -KEY4HEPSPACK_VERSION="9a65e824449f204cf083c29053401cbb60ad39d4" +KEY4HEPSPACK_VERSION="c53548c3ee19cac56017c5d096aaf5b015d0e5a6"