From d6c4e8d2deeae306a13e41329dce3035e42cca89 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 19 Jan 2024 15:38:38 -0600 Subject: [PATCH 1/3] feat: root +sofie --- 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 606b950b..09907d38 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -336,7 +336,7 @@ packages: root: require: - '@6.28.06' - - cxxstd=20 +fftw +fortran +gdml +http -ipo +mlp +python +root7 +tmva +vc +xrootd +ssl + - cxxstd=20 +fftw +fortran +gdml +http -ipo +mlp +python +root7 +sofie +tmva +vc +xrootd +ssl - any_of: [+opengl +webgui +x, -opengl -webgui -x] snakemake: require: From eeecb1fe7a2184e2bc5039ae45a54076bd22c169 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 19 Jan 2024 15:47:42 -0600 Subject: [PATCH 2/3] fix: root +tmva-sofie --- 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 09907d38..6a85d285 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -336,7 +336,7 @@ packages: root: require: - '@6.28.06' - - cxxstd=20 +fftw +fortran +gdml +http -ipo +mlp +python +root7 +sofie +tmva +vc +xrootd +ssl + - cxxstd=20 +fftw +fortran +gdml +http -ipo +mlp +python +root7 +tmva +tmva-sofie +vc +xrootd +ssl - any_of: [+opengl +webgui +x, -opengl -webgui -x] snakemake: require: From fc4153b2a10f4e8ec994fe9655b488c86e2617b6 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 31 Jan 2024 11:11:59 -0600 Subject: [PATCH 3/3] fix: spack cherry-pick root: New variants, patches --- spack.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack.sh b/spack.sh index d85b1896..0888f573 100644 --- a/spack.sh +++ b/spack.sh @@ -32,6 +32,7 @@ c07ddf83c32b7129247fe90eed486dd844047087 d3c796f2ce1da2dda198707def297aeab702d33c 19c20563cc86140aaf352d72079bd9de292be0ac d50f8d7b19e07f25a3ce8de28ff9b352fd926d7f +9e4fab277b8a5b9ec5587c8a8b6514f12c8042a4 --- ## Optional hash table with comma-separated file list read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ @@ -64,3 +65,4 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ## d3c796f2ce1da2dda198707def297aeab702d33c: pythia8: new version 8.310 ## 19c20563cc86140aaf352d72079bd9de292be0ac: Initial License Checkin ## d50f8d7b19e07f25a3ce8de28ff9b352fd926d7f: root: sha256 change on latest versions +## 9e4fab277b8a5b9ec5587c8a8b6514f12c8042a4: [root] New variants, patches