diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e392d8ec0e8fd7082e8572d1d6b756f46182f8c4..0e106ba72e235bf5584b8d005991c275a0ab4de2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,11 +10,12 @@ variables: ## Spack github version, e.g. v0.18.1 or commit hash SPACK_VERSION: "v0.19.0" ## Space-separated list of spack cherry-picks - SPACK_CHERRYPICKS: "b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e 99056e03bd3e903b222e300636ec484d85d4b3fb" + SPACK_CHERRYPICKS: "b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e 99056e03bd3e903b222e300636ec484d85d4b3fb f3f8b31be54280c6ef0b5f95ab85604aba3dff30" ## Ref: https://github.com/spack/spack/commit/[hash] ## [hash]: [description] ## b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e: geant4: version bumps for Geant4 11.1.0 ## 99056e03bd3e903b222e300636ec484d85d4b3fb: acts: new versions 19.11.0, 21.0.0, 21.1.0 + ## f3f8b31be54280c6ef0b5f95ab85604aba3dff30: XRootD: add checksum + patch for 5.5.1 ## EIC spack organization and repository, e.g. eic/eic-spack EICSPACK_ORGREPO: "eic/eic-spack" diff --git a/spack.yaml b/spack.yaml index c1ec38c8c7cd7df076f4a4ea11d7c59aab2e7d50..053dc4b505ac95ba015763fdf8d891d8bd06970a 100644 --- a/spack.yaml +++ b/spack.yaml @@ -50,7 +50,7 @@ spack: - spdlog@1.10.0 +fmt_external - stow@2.3.1 - tensorflow-lite@2.8.0 -xnnpack - - xrootd@5.3.2 cxxstd=17 +python + - xrootd@5.5.1 cxxstd=17 +python +scitokens-cpp concretizer: unify: true packages: