diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 5357bc99f..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.38.04' + - '@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: diff --git a/spack-packages.sh b/spack-packages.sh index e2dfec185..1ae1478c2 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -25,6 +25,7 @@ caf013be0ee1594fdbba8feb07ffecc88474a2b0 75395349957ad785cca50002dffb18bbcb48af27 acac89d6bb7079412e711a50a3f06681132a2723 438abd1e09f0cea9cb0ccc7e0326adcd0408196b +4dc856a13e9066ca3249a593d351af8cda521fa3 --- ## 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 +## 4dc856a13e9066ca3249a593d351af8cda521fa3: root: add v6.40.00, v6.40.02