diff --git a/spack.sh b/spack.sh index 7f9b3117e5419312409fc391de88fd45fdebcfae..0242a3ce3be9ee4701388710a8deddc262832962 100644 --- a/spack.sh +++ b/spack.sh @@ -29,6 +29,10 @@ d3bf1e04fca844abb7c1eeac38dda4e126c81b67 737b70cbbfacb3fba8054426e9b5bf8ede6d8faf a66586d749197841bd74e289802126f2359287a8 7503a417731910d918a7863d1862f62c9b76429d +9cdb2a8dbb742169fefe0214ee76530e7f14dfdf +04f0af0a28e1f6ff0ef0b50e28ecf9d19fe544e6 +395491815acb20e48050b77dca457aa7cc340ca1 +43d1cdb0bd4780bff369dafa681a8a7939313784 --- ## Optional hash table with comma-separated file list read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ @@ -57,3 +61,7 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ## 737b70cbbfacb3fba8054426e9b5bf8ede6d8faf: Buildcache: remove deprecated --allow-root and preview subcommand ## a66586d749197841bd74e289802126f2359287a8: spack buildcache push: best effort ## 7503a417731910d918a7863d1862f62c9b76429d: cuda: add v12.4.1 +## 9cdb2a8dbb742169fefe0214ee76530e7f14dfdf: dd4hep: depends_on root +root7 in some cases +## 04f0af0a28e1f6ff0ef0b50e28ecf9d19fe544e6: acts,dd4hep: restrict to podio@0 to prevent failures with podio@1 +## 395491815acb20e48050b77dca457aa7cc340ca1: dd4hep: mark conflict with root@6.31.1: +## 43d1cdb0bd4780bff369dafa681a8a7939313784: dd4hep: Add tag for version 1.30