diff --git a/eic-spack.sh b/eic-spack.sh index dd242bf1f9ff4e80fbaacf7ba9c9249f558b39de..b4e0cb26ed49ae102d4574298395e0e80a70879a 100644 --- a/eic-spack.sh +++ b/eic-spack.sh @@ -1,9 +1,9 @@ ## 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 <<- \ diff --git a/spack-environment/dev/spack.yaml b/spack-environment/dev/spack.yaml index c193a4e0a4217cadba485c456ea6475cd9656022..5d02406bbce6963ef1b4674357524148b9769808 100644 --- a/spack-environment/dev/spack.yaml +++ b/spack-environment/dev/spack.yaml @@ -77,6 +77,7 @@ spack: - py-wurlitzer - py-yapf - root + - snakemake - spdlog - stow - tensorflow-lite diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index b7a5f6c39735eb9636bb6d2ef7500f6df4eb0b57..a2f78b7a3e83ec8dc5fdbddb64b705cadfc41310 100644 --- a/spack-environment/packages.yaml +++ b/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'