Merge branch 'master' into 'cacheable-layer'

# Conflicts:
#   eic-spack.sh

eic-spack.sh

 ## EIC spack organization and repository, e.g. eic/eic-spack
 EICSPACK_ORGREPO="eic/eic-spack"
 
-## EIC spack github version, e.g. v0.19.7 or commit hash
-## note: nightly builds will use e.g. releases/v0.19
-EICSPACK_VERSION="ad3c491f36fbabac26fc1f2813439cfa10d31c33"
+## EIC spack commit hash or github version, e.g. v0.19.7
+## note: nightly builds could use a branch e.g. releases/v0.19
+EICSPACK_VERSION="e4f220bd405ffed7ddc3f7b58fff40acd392016e"
 
 ## Space-separated list of eic-spack cherry-picks
 read -r -d '' EICSPACK_CHERRYPICKS <<- \

spack-environment/dev/spack.yaml

@@ -77,6 +77,7 @@ spack:
     - py-wurlitzer
     - py-yapf
     - root
+    - snakemake
     - spdlog
     - stow
     - tensorflow-lite

spack-environment/packages.yaml

@@ -291,6 +291,10 @@ packages:
     - '@6.28.04'
     - cxxstd=17 +fftw +fortran +gdml +http -ipo +mlp +pythia8 +root7 +tmva +vc -webgui +xrootd +ssl
     - any_of: [+opengl +x, -opengl -x]
+  snakemake:
+    require:
+    - '@7.22.0'
+    - +http +s3
   spdlog:
     require:
     - '@1.11.0'