diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef12189453e1b1ce0722afb1df5da87e7ab0d56f..a3caa79557f279ca44597a4e5d6787a8b43a9b61 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 62da76cb5dca4d52c43bee06230cca6a5882f05d cc2ae9f270befa554ba8b09c68e89bb8248ea650 ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228" + SPACK_CHERRYPICKS: "b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e 99056e03bd3e903b222e300636ec484d85d4b3fb f3f8b31be54280c6ef0b5f95ab85604aba3dff30 2f057d729da61e8c12828df44377f0a93fed820f 39a1f1462b0abf12dfaccd33f84142c852c4b56e 4b12d015e1c316b4837e02ae37e2c69a8a647180 7f1467e795b1cab8b4855e019910c509896ea0e1 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,7 @@ variables: ## 2f057d729da61e8c12828df44377f0a93fed820f: py-scipy: add v1.9 ## 39a1f1462b0abf12dfaccd33f84142c852c4b56e: SIP build system: fix "python not defined in builder" ## 4b12d015e1c316b4837e02ae37e2c69a8a647180: py-jinja2-cli: new package + ## 7f1467e795b1cab8b4855e019910c509896ea0e1: dd4hep: new version 1.24, depends_on podio@0.16: ## 62da76cb5dca4d52c43bee06230cca6a5882f05d: directives: depends_on should not admit anonymous specs ## cc2ae9f270befa554ba8b09c68e89bb8248ea650: Add a "maintainer" directive ## ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228: Support packages for using scitokens on OSG diff --git a/spack.yaml b/spack.yaml index 332ff45573743b9e69c77db44a4e4ff6e7b999d1..b54d57438e86d4ef6b87f32aca1d5436aeac546f 100644 --- a/spack.yaml +++ b/spack.yaml @@ -12,7 +12,7 @@ spack: - cppcoro@git.10bbcdbf2be3ad3aa56febcf4c7662d771460a99 - dawn@3_91a - dawncut@1_54a - - dd4hep@1.23 +ddg4 +ddcad +hepmc3 +lcio + - dd4hep@1.24 +ddg4 +ddcad -frames +hepmc3 +lcio - edm4eic@1.2.2 cxxstd=17 - edm4hep@0.7 cxxstd=17 - eic-smear@1.1.10 @@ -35,7 +35,7 @@ spack: - opencascade@7.6.3 - osg-ca-certs@1.109.igtf.1.117 - pkg-config@0.29.2 - - podio@0.15 + - podio@0.16 - prmon@3.0.2 +plot - pythia8@8.306 +fastjet - python@3.10.8