diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e3d1a8819311073fbf05cd48203a705dbed526a..ef12189453e1b1ce0722afb1df5da87e7ab0d56f 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.0" ## Space-separated list of spack cherry-picks - SPACK_CHERRYPICKS: "b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e 99056e03bd3e903b222e300636ec484d85d4b3fb f3f8b31be54280c6ef0b5f95ab85604aba3dff30 2f057d729da61e8c12828df44377f0a93fed820f 39a1f1462b0abf12dfaccd33f84142c852c4b56e 4b12d015e1c316b4837e02ae37e2c69a8a647180" + SPACK_CHERRYPICKS: "b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e 99056e03bd3e903b222e300636ec484d85d4b3fb f3f8b31be54280c6ef0b5f95ab85604aba3dff30 2f057d729da61e8c12828df44377f0a93fed820f 39a1f1462b0abf12dfaccd33f84142c852c4b56e 4b12d015e1c316b4837e02ae37e2c69a8a647180 62da76cb5dca4d52c43bee06230cca6a5882f05d cc2ae9f270befa554ba8b09c68e89bb8248ea650 ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228" ## Ref: https://github.com/spack/spack/commit/[hash] ## [hash]: [description] ## b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e: geant4: version bumps for Geant4 11.1.0 @@ -20,6 +20,9 @@ variables: ## 2f057d729da61e8c12828df44377f0a93fed820f: py-scipy: add v1.9 ## 39a1f1462b0abf12dfaccd33f84142c852c4b56e: SIP build system: fix "python not defined in builder" ## 4b12d015e1c316b4837e02ae37e2c69a8a647180: py-jinja2-cli: new package + ## 62da76cb5dca4d52c43bee06230cca6a5882f05d: directives: depends_on should not admit anonymous specs + ## cc2ae9f270befa554ba8b09c68e89bb8248ea650: Add a "maintainer" directive + ## ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228: Support packages for using scitokens on OSG ## EIC spack organization and repository, e.g. eic/eic-spack EICSPACK_ORGREPO: "eic/eic-spack" diff --git a/spack.yaml b/spack.yaml index f77a9da848c9d72b3baac209b35edb91e60be878..332ff45573743b9e69c77db44a4e4ff6e7b999d1 100644 --- a/spack.yaml +++ b/spack.yaml @@ -33,6 +33,7 @@ spack: - nlohmann-json@3.11.2 - npsim@1.1.0 +geocad +http - opencascade@7.6.3 + - osg-ca-certs@1.109.igtf.1.117 - pkg-config@0.29.2 - podio@0.15 - prmon@3.0.2 +plot @@ -49,6 +50,7 @@ spack: - py-lxml@4.9.1 - py-matplotlib@3.6.2 - py-mplhep@0.3.26 + - py-htgettoken@1.16-33-g3788bb4 - py-numpy@1.23.4 - py-pandas@1.5.1 - py-pip@22.2.2