diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8533b315622e629f5403a266c0ae894f0263a2f..9d173f67139da305c2cbeddc765961647394d1df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ 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" + SPACK_CHERRYPICKS: "b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e 99056e03bd3e903b222e300636ec484d85d4b3fb f3f8b31be54280c6ef0b5f95ab85604aba3dff30 0ea81affd18820933640279bbc687038b3296a4e dceb4c9d655d0529e112b8929558be60973b39f7 f2b0c1deab87da3b5aa4c1f2ef4d6af06fa4e32d 2f057d729da61e8c12828df44377f0a93fed820f 39a1f1462b0abf12dfaccd33f84142c852c4b56e 4b12d015e1c316b4837e02ae37e2c69a8a647180 7f1467e795b1cab8b4855e019910c509896ea0e1 62da76cb5dca4d52c43bee06230cca6a5882f05d cc2ae9f270befa554ba8b09c68e89bb8248ea650 ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228 ae189cfab8d9036e8d39bbd3f1b61b400d1fcd5b" ## Ref: https://github.com/spack/spack/commit/[hash] ## [hash]: [description] ## b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e: geant4: version bumps for Geant4 11.1.0 @@ -27,6 +27,7 @@ variables: ## 62da76cb5dca4d52c43bee06230cca6a5882f05d: directives: depends_on should not admit anonymous specs ## cc2ae9f270befa554ba8b09c68e89bb8248ea650: Add a "maintainer" directive ## ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228: Support packages for using scitokens on OSG + ## ae189cfab8d9036e8d39bbd3f1b61b400d1fcd5b: geant4: new version 11.1.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 1f13813289c55a62580af75c709ae8abc5db5482..9eb373824f557a6beb59644bb33854bf51be7106 100644 --- a/spack.yaml +++ b/spack.yaml @@ -21,7 +21,7 @@ spack: - fastjet@3.4.0 - fmt@8.1.1 +shared cxxstd=17 - gaudi@36.7 +aida - - geant4@11.1.0 cxxstd=17 +opengl +vecgeom +x11 +qt +threads + - geant4@11.1.1 cxxstd=17 +opengl +vecgeom +x11 +qt +threads - hepmc3@3.2.5 +python +rootio - heppdt@2.06.01 - imagemagick@7.0.8-7