chore: root-6.26.10; format SPACK_CHERRYPICKS

.gitlab-ci.yml

@@ -11,7 +11,25 @@ variables:
   ## Spack github version, e.g. v0.18.1 or commit hash
   SPACK_VERSION: "v0.19.1"
   ## Space-separated list of spack cherry-picks
-  SPACK_CHERRYPICKS: "b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e 99056e03bd3e903b222e300636ec484d85d4b3fb f3f8b31be54280c6ef0b5f95ab85604aba3dff30 0ea81affd18820933640279bbc687038b3296a4e dceb4c9d655d0529e112b8929558be60973b39f7 f2b0c1deab87da3b5aa4c1f2ef4d6af06fa4e32d 2f057d729da61e8c12828df44377f0a93fed820f 39a1f1462b0abf12dfaccd33f84142c852c4b56e 4b12d015e1c316b4837e02ae37e2c69a8a647180 7f1467e795b1cab8b4855e019910c509896ea0e1 62da76cb5dca4d52c43bee06230cca6a5882f05d cc2ae9f270befa554ba8b09c68e89bb8248ea650 ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228 ae189cfab8d9036e8d39bbd3f1b61b400d1fcd5b"
+## Space-separated list of spack cherry-picks
+  SPACK_CHERRYPICKS: >
+    b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e
+    99056e03bd3e903b222e300636ec484d85d4b3fb
+    f3f8b31be54280c6ef0b5f95ab85604aba3dff30
+    0ea81affd18820933640279bbc687038b3296a4e
+    dceb4c9d655d0529e112b8929558be60973b39f7
+    f2b0c1deab87da3b5aa4c1f2ef4d6af06fa4e32d
+    2f057d729da61e8c12828df44377f0a93fed820f
+    39a1f1462b0abf12dfaccd33f84142c852c4b56e
+    4b12d015e1c316b4837e02ae37e2c69a8a647180
+    7f1467e795b1cab8b4855e019910c509896ea0e1
+    62da76cb5dca4d52c43bee06230cca6a5882f05d
+    cc2ae9f270befa554ba8b09c68e89bb8248ea650
+    ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228
+    ae189cfab8d9036e8d39bbd3f1b61b400d1fcd5b
+    3afe6f1adcc24335cbca9a9c03ffea188f802766
+    559c3de213707b5d52d899fd0382495f2cc8508d
+    8e84dcd7ef999e2659822b34372515175f1723c4
   ## Ref: https://github.com/spack/spack/commit/[hash]
   ## [hash]: [description]
   ## b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e: geant4: version bumps for Geant4 11.1.0
@@ -28,6 +46,9 @@ variables:
   ## cc2ae9f270befa554ba8b09c68e89bb8248ea650: Add a "maintainer" directive
   ## ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228: Support packages for using scitokens on OSG
   ## ae189cfab8d9036e8d39bbd3f1b61b400d1fcd5b: geant4: new version 11.1.1
+  ## 3afe6f1adcc24335cbca9a9c03ffea188f802766: ROOT: add math/gsl conflict and change version-dependent features to conditional variants
+  ## 559c3de213707b5d52d899fd0382495f2cc8508d: ROOT: new versions and associated dependency constraints
+  ## 8e84dcd7ef999e2659822b34372515175f1723c4: root: new version 6.28.00
 
   ## EIC spack organization and repository, e.g. eic/eic-spack
   EICSPACK_ORGREPO: "eic/eic-spack"

spack.yaml

@@ -63,7 +63,7 @@ spack:
     - py-uproot@4.3.5
     - py-yapf@0.30.0
     - qt@5.15.5 +opengl
-    - root@6.26.06 cxxstd=17 
+    - root@6.26.10 cxxstd=17 
           +fftw +fortran +gdml +http -ipo +mlp +pythia8 
           +root7 +tmva +vc -webgui +xrootd +ssl 
     - spdlog@1.10.0 +fmt_external