From 82fe41ebe829b55501725cecf140dfadc17f5380 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 21 May 2026 08:17:15 -0500 Subject: [PATCH 1/6] chore: spack cherry-pick: root: add v6.40.00 --- spack-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack-packages.sh b/spack-packages.sh index e2dfec185..c3d0f81d4 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -25,6 +25,7 @@ caf013be0ee1594fdbba8feb07ffecc88474a2b0 75395349957ad785cca50002dffb18bbcb48af27 acac89d6bb7079412e711a50a3f06681132a2723 438abd1e09f0cea9cb0ccc7e0326adcd0408196b +7f5e38344f648a4a5ad5c2bb7c1f8c5b1c439248 --- ## Optional hash table with comma-separated file list ## For these commits, the cherry-pick will be restricted to the listed files only. @@ -47,3 +48,4 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 75395349957ad785cca50002dffb18bbcb48af27: py-torch: ensure setuptools is not unnecessarily constrained for 2.10: ## acac89d6bb7079412e711a50a3f06681132a2723: cuda: append --allow-unsupported-compiler to CUDAFLAGS for dependent_spec ## 438abd1e09f0cea9cb0ccc7e0326adcd0408196b: herwig3: add CT14(?n)lo pdfsets as build-time resources +## 7f5e38344f648a4a5ad5c2bb7c1f8c5b1c439248: root: add v6.40.00 From d5d30effeeee8cfb86f3730969c085db9f43b552 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 21 May 2026 08:19:29 -0500 Subject: [PATCH 2/6] chore: root-6.40.00 --- 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 5357bc99f..e203354c0 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -641,7 +641,7 @@ packages: - hepmc=3 plugin-match=HERA,LEP,MC root: require: - - '@6.38.04' + - '@6.40.00' - cxxstd=20 +fftw +fortran +gdml +http -ipo +mlp +python +root7 +tmva +tmva-sofie +x +xrootd +ssl - any_of: [+opengl +webgui, -opengl -webgui] sherpa: From 6fa487bed3ab123011f6adecf00e4e54d72c903e Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 21 May 2026 11:52:14 -0500 Subject: [PATCH 3/6] fix: spack cherry-pick: root: fix style --- spack-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack-packages.sh b/spack-packages.sh index c3d0f81d4..02c879bac 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -26,6 +26,7 @@ caf013be0ee1594fdbba8feb07ffecc88474a2b0 acac89d6bb7079412e711a50a3f06681132a2723 438abd1e09f0cea9cb0ccc7e0326adcd0408196b 7f5e38344f648a4a5ad5c2bb7c1f8c5b1c439248 +5fc67dc0124554aa9793e6e67c9d2bcb31ef6f76 --- ## Optional hash table with comma-separated file list ## For these commits, the cherry-pick will be restricted to the listed files only. @@ -49,3 +50,4 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## acac89d6bb7079412e711a50a3f06681132a2723: cuda: append --allow-unsupported-compiler to CUDAFLAGS for dependent_spec ## 438abd1e09f0cea9cb0ccc7e0326adcd0408196b: herwig3: add CT14(?n)lo pdfsets as build-time resources ## 7f5e38344f648a4a5ad5c2bb7c1f8c5b1c439248: root: add v6.40.00 +## 5fc67dc0124554aa9793e6e67c9d2bcb31ef6f76: root: fix style From 90da0b18c7550fb79672d2e525268ea6c52e10ea Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 22 May 2026 08:00:20 -0500 Subject: [PATCH 4/6] fix: spack cherry-pick: root: tmva-sofie now depends on numpy --- spack-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack-packages.sh b/spack-packages.sh index 02c879bac..1565449db 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -27,6 +27,7 @@ acac89d6bb7079412e711a50a3f06681132a2723 438abd1e09f0cea9cb0ccc7e0326adcd0408196b 7f5e38344f648a4a5ad5c2bb7c1f8c5b1c439248 5fc67dc0124554aa9793e6e67c9d2bcb31ef6f76 +be44f22800980a10f783f9f42bf837a15f98bf38 --- ## Optional hash table with comma-separated file list ## For these commits, the cherry-pick will be restricted to the listed files only. @@ -51,3 +52,4 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 438abd1e09f0cea9cb0ccc7e0326adcd0408196b: herwig3: add CT14(?n)lo pdfsets as build-time resources ## 7f5e38344f648a4a5ad5c2bb7c1f8c5b1c439248: root: add v6.40.00 ## 5fc67dc0124554aa9793e6e67c9d2bcb31ef6f76: root: fix style +## be44f22800980a10f783f9f42bf837a15f98bf38: root: tmva-sofie now depends on numpy From d7cff35565929ad2ef3baaa97375a5f63f8c737b Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 24 Jun 2026 12:01:22 -0400 Subject: [PATCH 5/6] fix: spack cherry-pick: root: add v6.40.00, v6.40.02 --- spack-packages.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/spack-packages.sh b/spack-packages.sh index 1565449db..1ae1478c2 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -25,9 +25,7 @@ caf013be0ee1594fdbba8feb07ffecc88474a2b0 75395349957ad785cca50002dffb18bbcb48af27 acac89d6bb7079412e711a50a3f06681132a2723 438abd1e09f0cea9cb0ccc7e0326adcd0408196b -7f5e38344f648a4a5ad5c2bb7c1f8c5b1c439248 -5fc67dc0124554aa9793e6e67c9d2bcb31ef6f76 -be44f22800980a10f783f9f42bf837a15f98bf38 +4dc856a13e9066ca3249a593d351af8cda521fa3 --- ## Optional hash table with comma-separated file list ## For these commits, the cherry-pick will be restricted to the listed files only. @@ -50,6 +48,4 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 75395349957ad785cca50002dffb18bbcb48af27: py-torch: ensure setuptools is not unnecessarily constrained for 2.10: ## acac89d6bb7079412e711a50a3f06681132a2723: cuda: append --allow-unsupported-compiler to CUDAFLAGS for dependent_spec ## 438abd1e09f0cea9cb0ccc7e0326adcd0408196b: herwig3: add CT14(?n)lo pdfsets as build-time resources -## 7f5e38344f648a4a5ad5c2bb7c1f8c5b1c439248: root: add v6.40.00 -## 5fc67dc0124554aa9793e6e67c9d2bcb31ef6f76: root: fix style -## be44f22800980a10f783f9f42bf837a15f98bf38: root: tmva-sofie now depends on numpy +## 4dc856a13e9066ca3249a593d351af8cda521fa3: root: add v6.40.00, v6.40.02 From d0bb764efad6b716919a67dc94ca66ada69fece7 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 24 Jun 2026 14:39:55 -0400 Subject: [PATCH 6/6] chore: root-6.40.02 --- 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 e203354c0..75aa3bad7 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -641,7 +641,7 @@ packages: - hepmc=3 plugin-match=HERA,LEP,MC root: require: - - '@6.40.00' + - '@6.40.02' - cxxstd=20 +fftw +fortran +gdml +http -ipo +mlp +python +root7 +tmva +tmva-sofie +x +xrootd +ssl - any_of: [+opengl +webgui, -opengl -webgui] sherpa: