From d25975f64dc1788c29375a240b798ce7aa0db894 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 14 Nov 2025 18:46:27 -0600 Subject: [PATCH 01/20] Upgrade Spack Packages to v2025.11.0 --- spack-packages.sh | 59 +---------------------------------------------- 1 file changed, 1 insertion(+), 58 deletions(-) diff --git a/spack-packages.sh b/spack-packages.sh index 7fb8328d..ae5f8ec2 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -3,39 +3,13 @@ SPACKPACKAGES_ORGREPO="spack/spack-packages" ## Spack github version, e.g. v2025.07.0 or commit hash ## note: nightly builds will use e.g. develop -SPACKPACKAGES_VERSION="v2025.07.0" +SPACKPACKAGES_VERSION="v2025.11.0" ## Space-separated list of spack-packages cherry-picks read -r -d '' SPACKPACKAGES_CHERRYPICKS <<- \ --- || true -b5ffbcc4aa43bffbffa96ff9a436a68773e10933 -b6b6d79c25c1496472f9535ec33c9030b27353ab -405e97751385dccbd6ec6e6f3b57dc28fc04c76b -ba00d764b91db70bce8236bc528a1d4af37c4ce9 -4b243eb07a483a6bf527c2f74e5766b35afa528b -948d4ea14409e38d47882b5a5c2d61d99d02b30b -215e9f93f4de43095bd12e39809b9afeb89655f0 -8aaec9b76104af2cf58e7be55485d6c2385b41ab -8751ca4c4ba54559b40cdaa3c319bf14db72e28e -2c1e68ded81add6d3d0fbc005ad19b0727639204 -a118c877bcca1d71810528ba481b8d3f819035f1 -0c164b846058d9c57c9adb6b17ef86ead9f4b8c4 -b440c61b9cddfab0fd59dd5fc607c95247a18bc9 -698ce0531e4be2d55ca667d6f9341636397c2662 -1d53be2a26ecb7809c1f6006ed8cbfe7febee7a9 a115a811bdfce4db5298a9ba9b7903ccfb0de101 22dadd619053ff0872903549db616200bda082f0 -7fad8a78d35b5556e1d7aa92a71a4e1c58a1665a -1b976bbdf7c5bce37d6541beb93445791f9292c6 -20aa538bd0d33743b8cd9dd9179c759b85615d47 -795ad32793a7dfda1086f31b7e49cf4ae52672f6 -e61079273e806301d76cc64f53fb034980988583 -b063312bb52fb62010e04588f6b16d37e16c8d02 -b7870dfad11c4e8ca9690b0895c98f16d79f5398 -1e8f896b2807bcc48553e90d6212f0931fa5262f -e998e20d3979c5aa47faaf59a8020e3fab13ab97 -904792d49dc4236c5394dbc0aebbe45175b59187 -a3f3a80e2877645c72cca0381c820307fe1d4523 559789f67245a40306aeea636b61348e97d4f092 95c45b6c3322e151fd29ed00ea10567b97705ee4 d6f99b8d611cf740eb45e13df2c84044a4ca6ae4 @@ -78,42 +52,11 @@ f5742718da7bd1d078ddc8423011a82ef2e3c759 ## For all other commits, the cherry-pick will be applied without restriction (default). read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ --- || true -[b063312bb52fb62010e04588f6b16d37e16c8d02]=repos/spack_repo/builtin/packages/py_tensorflow/package.py -[7fad8a78d35b5556e1d7aa92a71a4e1c58a1665a]=repos/spack_repo/builtin/packages/py_tensorflow/package.py,repos/spack_repo/builtin/packages/py_tensorboard/package.py -[4ef82e75f5cae7b4d093e41043e26b259498264e]=repos/spack_repo/builtin/packages/podio/package.py -[158693457ba1717a89a9e2f9614c6982b6aff441]=repos/spack_repo/builtin/packages/acts/package.py,repos/spack_repo/builtin/packages/celeritas/package.py -[9cf8ee9c28465568d0b8871f245c400470e74ec7]=repos/spack_repo/builtin/packages/edm4hep/package.py --- ## Ref: https://github.com/spack/spack-packages/commit/[hash] ## [hash]: [description] -## b5ffbcc4aa43bffbffa96ff9a436a68773e10933: strace: add v6.15 -## b6b6d79c25c1496472f9535ec33c9030b27353ab: iwyu: add patch for 0.23 -## 405e97751385dccbd6ec6e6f3b57dc28fc04c76b: iwyu,g2,r-curl: requires(pkg) -> requires(^pkg) -## ba00d764b91db70bce8236bc528a1d4af37c4ce9: py-gfal2-python: depends_on c -## 4b243eb07a483a6bf527c2f74e5766b35afa528b: gobject-introspection: restore setuptools@44: support -## 948d4ea14409e38d47882b5a5c2d61d99d02b30b: scikit-hep packages: update to latest major.minor versions -## 215e9f93f4de43095bd12e39809b9afeb89655f0: py-boost-histogram: depends_on py-setuptools-scm type build -## 8aaec9b76104af2cf58e7be55485d6c2385b41ab: py-uproot: depends_on py-numpy@:1 when @:5.3.2 -## 8751ca4c4ba54559b40cdaa3c319bf14db72e28e: py-hist: add v2.6.2 thru v2.8.0 (switch to hatchling) -## 2c1e68ded81add6d3d0fbc005ad19b0727639204: pythia8: add v8.314 and v8.315 -## a118c877bcca1d71810528ba481b8d3f819035f1: py-hist: fix py-boost-histogram dependency -## 0c164b846058d9c57c9adb6b17ef86ead9f4b8c4: g4vg: new version 1.0.5 -## b440c61b9cddfab0fd59dd5fc607c95247a18bc9: force CMAKE_INSTALL_RPATH to prefix/lib/root for ROOT -## 698ce0531e4be2d55ca667d6f9341636397c2662: root: add v6.36.02 -## 1d53be2a26ecb7809c1f6006ed8cbfe7febee7a9: root: add v6.36.04 ## a115a811bdfce4db5298a9ba9b7903ccfb0de101: github-copilot: new package ## 22dadd619053ff0872903549db616200bda082f0: claude-code: new package -## 1b976bbdf7c5bce37d6541beb93445791f9292c6: py-keras: add v3.11.0 -## 20aa538bd0d33743b8cd9dd9179c759b85615d47: py-keras: add v3.11.1 -## 795ad32793a7dfda1086f31b7e49cf4ae52672f6: py-keras: add v3.11.2 -## e61079273e806301d76cc64f53fb034980988583: py-keras: add v3.11.3 -## b7870dfad11c4e8ca9690b0895c98f16d79f5398: py-keras: add v3.12.0 -## b063312bb52fb62010e04588f6b16d37e16c8d02: Remove Python-related deprecations -## 7fad8a78d35b5556e1d7aa92a71a4e1c58a1665a: py-tensorflow: add v2.19, v2.20 -## 1e8f896b2807bcc48553e90d6212f0931fa5262f: simsipm: Add conflict for aarch64 -## e998e20d3979c5aa47faaf59a8020e3fab13ab97: py-immutables: add v0.21 -## 904792d49dc4236c5394dbc0aebbe45175b59187: py-yapf: add versions -## a3f3a80e2877645c72cca0381c820307fe1d4523: py-numba: fix python dependency bounds ## 559789f67245a40306aeea636b61348e97d4f092: estarlight: add thru v1.2.0 ## 95c45b6c3322e151fd29ed00ea10567b97705ee4: py-tensorflow: modify cuDNN dependency versions when +cuda ## d6f99b8d611cf740eb45e13df2c84044a4ca6ae4: py-tensorflow: patch to build with +cuda From 7ea64a9a29fa02918f9acffff7da64025d8e59c6 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 20 Nov 2025 16:25:17 -0600 Subject: [PATCH 02/20] Remove Julia version upgrade spack cherry-picks --- spack-packages.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spack-packages.sh b/spack-packages.sh index ae5f8ec2..0a78e7e1 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -14,8 +14,6 @@ a115a811bdfce4db5298a9ba9b7903ccfb0de101 95c45b6c3322e151fd29ed00ea10567b97705ee4 d6f99b8d611cf740eb45e13df2c84044a4ca6ae4 bc25e5eb2f8f7a8733cdc10d92e9787358c82cfa -c4d983b764d7b1ee2b63da79f5f25365ac61ce7a -44da889cc86bb8a5315c729a7c79f2c002c9c951 5c37f836753e8f9683fdc547f3661c5045abcbd1 c75e10845431600b163c597545bd099e427c62f5 438a7d95de1b81e15107edbf341b20824ec80635 @@ -61,8 +59,6 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 95c45b6c3322e151fd29ed00ea10567b97705ee4: py-tensorflow: modify cuDNN dependency versions when +cuda ## d6f99b8d611cf740eb45e13df2c84044a4ca6ae4: py-tensorflow: patch to build with +cuda ## bc25e5eb2f8f7a8733cdc10d92e9787358c82cfa: actsvg: patch version numbers into source source -## c4d983b764d7b1ee2b63da79f5f25365ac61ce7a: Julia: add v1.11.6 -## 44da889cc86bb8a5315c729a7c79f2c002c9c951: Julia: add v1.11.7 ## 5c37f836753e8f9683fdc547f3661c5045abcbd1: root: require openblas ~ilp64 symbol_suffix=none when ^openblas ## c75e10845431600b163c597545bd099e427c62f5: dd4hep: v1.33 ## 438a7d95de1b81e15107edbf341b20824ec80635: root: add v6.36.06 From f4f72de537ccfecbfc740bdec7513bfa20e2cb2f Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 20 Nov 2025 18:36:39 -0600 Subject: [PATCH 03/20] fix: rm spack cherry-pick: actsvg: patch version numbers into source source --- spack-packages.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/spack-packages.sh b/spack-packages.sh index 0a78e7e1..0fbe0887 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -13,7 +13,6 @@ a115a811bdfce4db5298a9ba9b7903ccfb0de101 559789f67245a40306aeea636b61348e97d4f092 95c45b6c3322e151fd29ed00ea10567b97705ee4 d6f99b8d611cf740eb45e13df2c84044a4ca6ae4 -bc25e5eb2f8f7a8733cdc10d92e9787358c82cfa 5c37f836753e8f9683fdc547f3661c5045abcbd1 c75e10845431600b163c597545bd099e427c62f5 438a7d95de1b81e15107edbf341b20824ec80635 @@ -58,7 +57,6 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 559789f67245a40306aeea636b61348e97d4f092: estarlight: add thru v1.2.0 ## 95c45b6c3322e151fd29ed00ea10567b97705ee4: py-tensorflow: modify cuDNN dependency versions when +cuda ## d6f99b8d611cf740eb45e13df2c84044a4ca6ae4: py-tensorflow: patch to build with +cuda -## bc25e5eb2f8f7a8733cdc10d92e9787358c82cfa: actsvg: patch version numbers into source source ## 5c37f836753e8f9683fdc547f3661c5045abcbd1: root: require openblas ~ilp64 symbol_suffix=none when ^openblas ## c75e10845431600b163c597545bd099e427c62f5: dd4hep: v1.33 ## 438a7d95de1b81e15107edbf341b20824ec80635: root: add v6.36.06 From 2ae9073271119e6917987650c671ccbd51e38f0e Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 25 Dec 2025 12:24:42 -0600 Subject: [PATCH 04/20] fix: remove already applied commits --- spack-packages.sh | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/spack-packages.sh b/spack-packages.sh index 0fbe0887..92e2c13d 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -16,31 +16,14 @@ d6f99b8d611cf740eb45e13df2c84044a4ca6ae4 5c37f836753e8f9683fdc547f3661c5045abcbd1 c75e10845431600b163c597545bd099e427c62f5 438a7d95de1b81e15107edbf341b20824ec80635 -c71f8e48245012565ac7b0648dfda137b0071de7 -4ef82e75f5cae7b4d093e41043e26b259498264e -8d027b1651840631350d0ba9f30624f2baf26350 -566e1b070e17ffe8c2d0bf4122568af8a81db1cd -048bffaea064919ccfc2f740e14bbb987e7f5c7e 6b57d7a93de84dd5492b9308a9612924ab641dce ba94c07db577eaf5eb4b0450721fbc7e98879922 -57a0c5d83aba319c37e51c7a6f965f28f49cdb77 -d0b0e511376f74be2cd3a2878bed781d39a6066a -a6762cd1b4dff3297dd83664a6c09450324fc7bd -158693457ba1717a89a9e2f9614c6982b6aff441 -a46e40be55d002e4708303735f7eb4aca2482d0a -96d1e30c389599be9b3d95a0af16b49afd8b6e31 -2050ba18c273506ebfd90744315850e55766fff7 -3c85253b0bd2bb61eae6b5532d657a34e0939c69 -d6b78b9ed0cf6ac3d6ddfcbc287bc0db3cd645e7 f201ecd5e5923b394d14f74bc220dea06b9ab28f 2e05bbbe808442e761647da571500ee128654f4f 9ec50db07733195bba922b8c6dcbbb1de9c56adf d95db21e9c9fa6eab1a9e62e2ba56066f2f955a7 -9cf8ee9c28465568d0b8871f245c400470e74ec7 -78a6c5f0a2531a78be5c9dd9235cf92036d541f5 be6546b82b43d82edba804f1e362a709809ba537 f5742718da7bd1d078ddc8423011a82ef2e3c759 -56e5282f7ef78180895b5d99db57d2a166b6d0e1 922b2f6011dbf01aebb332a1ebf949b105c74247 2ba80e697faf80613b038615b2345b7a777cc438 --- @@ -60,30 +43,13 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 5c37f836753e8f9683fdc547f3661c5045abcbd1: root: require openblas ~ilp64 symbol_suffix=none when ^openblas ## c75e10845431600b163c597545bd099e427c62f5: dd4hep: v1.33 ## 438a7d95de1b81e15107edbf341b20824ec80635: root: add v6.36.06 -## c71f8e48245012565ac7b0648dfda137b0071de7: podio: Add latest tag 1.4 and 1.4.1 -## 4ef82e75f5cae7b4d093e41043e26b259498264e: Deprecation removals: P -## 8d027b1651840631350d0ba9f30624f2baf26350: podio: Add version 1.5 -## 566e1b070e17ffe8c2d0bf4122568af8a81db1cd: podio: add v1.6 -## 048bffaea064919ccfc2f740e14bbb987e7f5c7e: podio: Add the conditional value 23 for cxxstd ## 6b57d7a93de84dd5492b9308a9612924ab641dce: podio: ensure Python.h is found in ROOT ACLiC ## ba94c07db577eaf5eb4b0450721fbc7e98879922: podio: use headers.directories[0] to get str, not list -## 57a0c5d83aba319c37e51c7a6f965f28f49cdb77: eigen: add v3.4.0-44-g37248b26a -## d0b0e511376f74be2cd3a2878bed781d39a6066a: eigen: Use Release build type by default -## a6762cd1b4dff3297dd83664a6c09450324fc7bd: acts: only init submodules when +odd; HEP: rm opendatadetector -## 158693457ba1717a89a9e2f9614c6982b6aff441: Deprecation removals: A-D -## a46e40be55d002e4708303735f7eb4aca2482d0a: acts: deprecate versions :38 -## 96d1e30c389599be9b3d95a0af16b49afd8b6e31: eigen: add versions 5.0.0 and 3.4.1 -## 2050ba18c273506ebfd90744315850e55766fff7: acts: add upper limit on podio -## 3c85253b0bd2bb61eae6b5532d657a34e0939c69: acts: add v44.0.0, v44.0.1, v44.1.0 -## d6b78b9ed0cf6ac3d6ddfcbc287bc0db3cd645e7: acts: Add +gnn variant and add necessary dependencies ## f201ecd5e5923b394d14f74bc220dea06b9ab28f: acts: add v44.2.0 ## 2e05bbbe808442e761647da571500ee128654f4f: acts: add v44.3.0 ## 9ec50db07733195bba922b8c6dcbbb1de9c56adf: ollama: add through v0.13.1 ## d95db21e9c9fa6eab1a9e62e2ba56066f2f955a7: root: add v6.38.00 -## 9cf8ee9c28465568d0b8871f245c400470e74ec7: Deprecation removals: E-H -## 78a6c5f0a2531a78be5c9dd9235cf92036d541f5: edm4hep: Add latest tags and update dependencies ## be6546b82b43d82edba804f1e362a709809ba537: gaudi: allow newer fmt for v39 ## f5742718da7bd1d078ddc8423011a82ef2e3c759: gaudi: workaround test-dependency bug with a when -## 56e5282f7ef78180895b5d99db57d2a166b6d0e1: celeritas: new versions 0.6.1, 0.6.2 ## 922b2f6011dbf01aebb332a1ebf949b105c74247: celeritas: add v0.6.3 ## 2ba80e697faf80613b038615b2345b7a777cc438: py-flatbuffers: add v25.9.23 From ccc6035a4c517fa6c2c3344505fcc0d3b5d8bace Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 25 Dec 2025 14:52:05 -0600 Subject: [PATCH 05/20] chore: py-dask-2025.3.0 --- 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 1d7709df..5440f387 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -374,7 +374,7 @@ packages: - '@1.5:' py-dask: require: - - '@2024.7.1:' + - '@2025.3.0:' py-dask-histogram: require: - '@2025.2.0:' diff --git a/spack-packages.sh b/spack-packages.sh index 92e2c13d..a633de72 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -26,6 +26,8 @@ be6546b82b43d82edba804f1e362a709809ba537 f5742718da7bd1d078ddc8423011a82ef2e3c759 922b2f6011dbf01aebb332a1ebf949b105c74247 2ba80e697faf80613b038615b2345b7a777cc438 +9e8f996350ac51c620e61a3a3980577fe471e35a +a4cc9fad86c9c3353e65bd379f708f70d9984bf0 --- ## Optional hash table with comma-separated file list ## For these commits, the cherry-pick will be restricted to the listed files only. @@ -53,3 +55,5 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## f5742718da7bd1d078ddc8423011a82ef2e3c759: gaudi: workaround test-dependency bug with a when ## 922b2f6011dbf01aebb332a1ebf949b105c74247: celeritas: add v0.6.3 ## 2ba80e697faf80613b038615b2345b7a777cc438: py-flatbuffers: add v25.9.23 +## 9e8f996350ac51c620e61a3a3980577fe471e35a: py-dask: add v2025.3.0 (for py-dask-awkward) +## a4cc9fad86c9c3353e65bd379f708f70d9984bf0: py-distributed: fix typo From 3fda706f8610328dcb69d4c42b289672263a393e Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 25 Dec 2025 15:22:48 -0600 Subject: [PATCH 06/20] chore: py-dask-2024.12.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 5440f387..3128040b 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -374,7 +374,7 @@ packages: - '@1.5:' py-dask: require: - - '@2025.3.0:' + - '@2024.12.1:' py-dask-histogram: require: - '@2025.2.0:' diff --git a/spack-packages.sh b/spack-packages.sh index a633de72..37e6c86f 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -28,6 +28,8 @@ f5742718da7bd1d078ddc8423011a82ef2e3c759 2ba80e697faf80613b038615b2345b7a777cc438 9e8f996350ac51c620e61a3a3980577fe471e35a a4cc9fad86c9c3353e65bd379f708f70d9984bf0 +760f3889877f17df24229a03d5dda25189b88a29 +2de6b7a78840d8e67113f190783a1c936709b643 --- ## Optional hash table with comma-separated file list ## For these commits, the cherry-pick will be restricted to the listed files only. @@ -57,3 +59,5 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 2ba80e697faf80613b038615b2345b7a777cc438: py-flatbuffers: add v25.9.23 ## 9e8f996350ac51c620e61a3a3980577fe471e35a: py-dask: add v2025.3.0 (for py-dask-awkward) ## a4cc9fad86c9c3353e65bd379f708f70d9984bf0: py-distributed: fix typo +## 760f3889877f17df24229a03d5dda25189b88a29: py-dask, py-distributed: add v2024.12.1 (for py-hist) +## 2de6b7a78840d8e67113f190783a1c936709b643: py-dask, py-distributed: fix style From ba5a783a6a67226939b5fef21f7e5f1f191b5f5c Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 25 Dec 2025 19:29:17 -0600 Subject: [PATCH 07/20] fix: constrain py-requests and py-dask --- spack-environment/packages.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 3128040b..63b0402c 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -374,7 +374,7 @@ packages: - '@1.5:' py-dask: require: - - '@2024.12.1:' + - '@2024.12.1' py-dask-histogram: require: - '@2025.2.0:' @@ -470,6 +470,9 @@ packages: py-pyyaml: require: - '@6.0.2:' + py-requests: + require: + - '@2.32.5:' py-rich: require: - '@13:' From e80d072f3e6025eb6465016315cb4a2e22c6e8e2 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 25 Dec 2025 22:22:08 -0600 Subject: [PATCH 08/20] docs: comment reason for py-dask pin --- 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 63b0402c..2e58628c 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -374,7 +374,7 @@ packages: - '@1.5:' py-dask: require: - - '@2024.12.1' + - '@2024.12.1' # pinned within py-hist's supported range 2023:2024 py-dask-histogram: require: - '@2025.2.0:' From d2c2d7bda7f2ebc575b39d6570b6ceab3a7ca06f Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 26 Dec 2025 13:39:16 -0600 Subject: [PATCH 09/20] fix: avoid +ipo in all: prefer or require --- spack-environment/packages.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 2e58628c..d7bde7bc 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -16,12 +16,14 @@ packages: # and 'prefer' at least retains some (less strict) preference in that case prefer: - '%gcc' - - +ipo + # FIXME any ipo preference breaks llvm external reuse + #- +ipo - build_system=cmake - build_type=Release require: - '%gcc' - - any_of: [+ipo, '@:'] + # FIXME any ipo requirement breaks llvm external reuse + #- any_of: [+ipo, '@:'] - any_of: [build_system=cmake, '@:'] - any_of: [build_type=Release, '@:'] acts: From 38de2ce3c4f3f17d7b3c0430266ba7ddfc05a432 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sat, 27 Dec 2025 16:41:09 -0600 Subject: [PATCH 10/20] fix: spack cherry-pick: harfbuzz: Ensure consistent meson builder with cairo dependency --- spack-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack-packages.sh b/spack-packages.sh index 37e6c86f..d94db9d9 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -30,6 +30,7 @@ f5742718da7bd1d078ddc8423011a82ef2e3c759 a4cc9fad86c9c3353e65bd379f708f70d9984bf0 760f3889877f17df24229a03d5dda25189b88a29 2de6b7a78840d8e67113f190783a1c936709b643 +7743e5ac5cdf9075800b3edacfed628c795a9a5e --- ## Optional hash table with comma-separated file list ## For these commits, the cherry-pick will be restricted to the listed files only. @@ -61,3 +62,4 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## a4cc9fad86c9c3353e65bd379f708f70d9984bf0: py-distributed: fix typo ## 760f3889877f17df24229a03d5dda25189b88a29: py-dask, py-distributed: add v2024.12.1 (for py-hist) ## 2de6b7a78840d8e67113f190783a1c936709b643: py-dask, py-distributed: fix style +## 7743e5ac5cdf9075800b3edacfed628c795a9a5e: harfbuzz: Ensure consistent meson builder with cairo dependency From 8e5ee672b665a7fa5213ac859d13e599d7060834 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sat, 27 Dec 2025 16:42:03 -0600 Subject: [PATCH 11/20] fix: ci: concretizer: unify: when_possible --- spack-environment/ci/spack.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack-environment/ci/spack.yaml b/spack-environment/ci/spack.yaml index 38349bca..a55aac25 100644 --- a/spack-environment/ci/spack.yaml +++ b/spack-environment/ci/spack.yaml @@ -4,6 +4,8 @@ spack: - ../packages.yaml - ../packages_root_without_opengl.yaml - ../view.yaml + concretizer: + unify: when_possible specs: - acts - actsvg From cb55b624f6cc4b66c19d6fd081f2d5662e07d7b6 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 28 Dec 2025 12:45:47 -0600 Subject: [PATCH 12/20] fix: update SPACKPACKAGES_VERSION note on buildcache visibilty --- spack-packages.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spack-packages.sh b/spack-packages.sh index d94db9d9..1bc041e5 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -2,7 +2,9 @@ SPACKPACKAGES_ORGREPO="spack/spack-packages" ## Spack github version, e.g. v2025.07.0 or commit hash -## note: nightly builds will use e.g. develop +## Note: nightly builds will use e.g. develop +## Note: when changing this, also make new buildcache public +## (default is only visible with internal authentication) SPACKPACKAGES_VERSION="v2025.11.0" ## Space-separated list of spack-packages cherry-picks From 40b79f1f495d065440d84e1091f8bac74475a80e Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 28 Dec 2025 13:09:50 -0600 Subject: [PATCH 13/20] fix: spack cherry-pick: harfbuzz/pango: add harfbuzz gobject variant (& req for pango) --- spack-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack-packages.sh b/spack-packages.sh index 1bc041e5..4bbdd5c6 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -33,6 +33,7 @@ a4cc9fad86c9c3353e65bd379f708f70d9984bf0 760f3889877f17df24229a03d5dda25189b88a29 2de6b7a78840d8e67113f190783a1c936709b643 7743e5ac5cdf9075800b3edacfed628c795a9a5e +b9ad19ee2ce47f8b7fbe187d41d898f873bbc121 --- ## Optional hash table with comma-separated file list ## For these commits, the cherry-pick will be restricted to the listed files only. @@ -65,3 +66,4 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 760f3889877f17df24229a03d5dda25189b88a29: py-dask, py-distributed: add v2024.12.1 (for py-hist) ## 2de6b7a78840d8e67113f190783a1c936709b643: py-dask, py-distributed: fix style ## 7743e5ac5cdf9075800b3edacfed628c795a9a5e: harfbuzz: Ensure consistent meson builder with cairo dependency +## b9ad19ee2ce47f8b7fbe187d41d898f873bbc121: harfbuzz/pango: add harfbuzz gobject variant (& req for pango) From c9f86cade4b48dc7a71cd78172a4d9f85d069626 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 28 Dec 2025 15:43:24 -0600 Subject: [PATCH 14/20] fix: harfbuzz: require: build_system=meson --- spack-environment/packages.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index d7bde7bc..32e1cdc1 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -206,6 +206,11 @@ packages: require: - '@12.1.0:' - +expat ~ghostscript +pangocairo + harfbuzz: + require: + # harfbuzz fails to find cairo.h in the gir parts of cmake builds when cairo is meson-built + - spec: build_system=meson + when: +gobject ^cairo build_system=meson hdf5: require: - ~cxx ~fortran +hl +ipo ~java ~map +mpi +shared ~subfiling ~szip ~threadsafe +tools From 868c506b1272a5db51c120d6180836bfa3a3587c Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 28 Dec 2025 21:59:23 -0600 Subject: [PATCH 15/20] fix: allow spack gc to fail due to no-op . --- containers/eic/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/eic/Dockerfile b/containers/eic/Dockerfile index 5be9e16a..eb1c4f0e 100644 --- a/containers/eic/Dockerfile +++ b/containers/eic/Dockerfile @@ -281,7 +281,7 @@ RUN --mount=type=cache,target=/var/cache/spack \ set -e spack env activate --dir ${SPACK_ENV} spack ${SPACK_FLAGS} install ${SPACK_INSTALL_FLAGS} --use-buildcache only -spack gc --yes-to-all go go-bootstrap rust rust-bootstrap py-setuptools-rust py-maturin +spack gc --yes-to-all go go-bootstrap rust rust-bootstrap py-setuptools-rust py-maturin || true EOF From 9e52b75bcf5cbeb273d9b38d46bba9a6ead7acdf Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 29 Dec 2025 10:58:55 -0600 Subject: [PATCH 16/20] fix: packages: llvm: require: disable ipo requirements --- spack-environment/packages.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 32e1cdc1..923e589f 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -272,8 +272,9 @@ packages: - +python llvm: require: - - ~gold - - any_of: [~ipo, '@:'] + - any_of: [~gold, '@:'] + # FIXME any ipo requirement breaks llvm external reuse + #- any_of: [~ipo, '@:'] madx: require: - '@5.08.01:' From b06192e3c157104701e176fd403046af14ae5059 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 29 Dec 2025 11:02:59 -0600 Subject: [PATCH 17/20] Revert "fix: allow spack gc to fail due to no-op" This reverts commit 868c506b1272a5db51c120d6180836bfa3a3587c. --- containers/eic/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/eic/Dockerfile b/containers/eic/Dockerfile index eb1c4f0e..5be9e16a 100644 --- a/containers/eic/Dockerfile +++ b/containers/eic/Dockerfile @@ -281,7 +281,7 @@ RUN --mount=type=cache,target=/var/cache/spack \ set -e spack env activate --dir ${SPACK_ENV} spack ${SPACK_FLAGS} install ${SPACK_INSTALL_FLAGS} --use-buildcache only -spack gc --yes-to-all go go-bootstrap rust rust-bootstrap py-setuptools-rust py-maturin || true +spack gc --yes-to-all go go-bootstrap rust rust-bootstrap py-setuptools-rust py-maturin EOF From 3d90277a4951bbf583f5d9727e8bb4c3c424bada Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 29 Dec 2025 12:46:39 -0600 Subject: [PATCH 18/20] fix: spack cherry-pick: openblas: patch for +dynamic_dispatch target=aarch64 --- spack-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack-packages.sh b/spack-packages.sh index 4bbdd5c6..a9ee4543 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -34,6 +34,7 @@ a4cc9fad86c9c3353e65bd379f708f70d9984bf0 2de6b7a78840d8e67113f190783a1c936709b643 7743e5ac5cdf9075800b3edacfed628c795a9a5e b9ad19ee2ce47f8b7fbe187d41d898f873bbc121 +931b8f47ff9470b3f957f0bb462964702277301a --- ## Optional hash table with comma-separated file list ## For these commits, the cherry-pick will be restricted to the listed files only. @@ -67,3 +68,4 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 2de6b7a78840d8e67113f190783a1c936709b643: py-dask, py-distributed: fix style ## 7743e5ac5cdf9075800b3edacfed628c795a9a5e: harfbuzz: Ensure consistent meson builder with cairo dependency ## b9ad19ee2ce47f8b7fbe187d41d898f873bbc121: harfbuzz/pango: add harfbuzz gobject variant (& req for pango) +## 931b8f47ff9470b3f957f0bb462964702277301a: openblas: patch for +dynamic_dispatch target=aarch64 From 322c83f4f8db552f32252ce2e100a36c34c923b2 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 29 Dec 2025 23:04:07 -0600 Subject: [PATCH 19/20] fix: eic_cvmfs: concretizer: unify: when_possible --- spack-environment/cvmfs/spack.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack-environment/cvmfs/spack.yaml b/spack-environment/cvmfs/spack.yaml index fb29e029..4736b2c6 100644 --- a/spack-environment/cvmfs/spack.yaml +++ b/spack-environment/cvmfs/spack.yaml @@ -5,6 +5,8 @@ spack: - ../packages_cvmfs_geant4data.yaml - ../packages_root_without_opengl.yaml - ../view.yaml + concretizer: + unify: when_possible specs: - acts - actsvg From b8cb9af9cafb78b46f08f002e83b04bc4a9b76aa Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 30 Dec 2025 07:42:19 -0600 Subject: [PATCH 20/20] fix: ci_without_acts: concretizer: unify: when_possible --- spack-environment/ci_without_acts/spack.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack-environment/ci_without_acts/spack.yaml b/spack-environment/ci_without_acts/spack.yaml index c93948f2..13bb06f0 100644 --- a/spack-environment/ci_without_acts/spack.yaml +++ b/spack-environment/ci_without_acts/spack.yaml @@ -4,6 +4,8 @@ spack: - ../packages.yaml - ../packages_root_without_opengl.yaml - ../view.yaml + concretizer: + unify: when_possible specs: - actsvg - afterburner