diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 2f6bfdf06d89bf22e8476b8e055332c32b8312d3..ef8d98e896cecb6cba9a5a28805277da3093b6a8 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -18,8 +18,9 @@ packages: - any_of: [build_type=Release, '@:'] acts: require: - - '@31.2.0' - - cxxstd=20 +binaries +dd4hep +edm4hep +examples +fatras +geant4 +identification +json +onnx +podio +python +tgeo + - '%clang' + - '@33.1.0' + - cxxstd=20 +dd4hep +edm4hep +examples +fatras +geant4 +identification +json +onnx +podio +python +tgeo actsvg: require: - '@0.4.26' @@ -103,6 +104,7 @@ packages: - '@1.1.12' eicrecon: require: + - '%clang' - '@1.16.1' # EICRECON_VERSION eigen: require: diff --git a/spack.sh b/spack.sh index 1a9adf9315045f7ba1a49b0f4dc33ef3c3c568a6..7f9b3117e5419312409fc391de88fd45fdebcfae 100644 --- a/spack.sh +++ b/spack.sh @@ -28,6 +28,7 @@ d3bf1e04fca844abb7c1eeac38dda4e126c81b67 3b59817ea7be35f4222dc88313734f7a30733ad7 737b70cbbfacb3fba8054426e9b5bf8ede6d8faf a66586d749197841bd74e289802126f2359287a8 +7503a417731910d918a7863d1862f62c9b76429d --- ## Optional hash table with comma-separated file list read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ @@ -38,7 +39,7 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ## 09f75ee426a2e05e0543570821582480ff823ba5: setup-env.sh: if exe contains qemu, use /proc/$$/comm instead ## f6d50f790ee8b123f7775429f6ca6394170e6de9: gaudi: Add version 38.1 ## 63f6e6079aacc99078386e5c8ff06173841b9595: gaudi: upstream patch when @38.1 for missing #include <list> -## 9092dc96e6c87a9c043e4421e1a524e23ec649f6: acts: pass cuda_arch to CMAKE_CUDA_ARCHITECTURES +## 092dc96e6c87a9c043e4421e1a524e23ec649f60: acts: pass cuda_arch to CMAKE_CUDA_ARCHITECTURES ## 85f13442d2a7486daba81fdd9a3b6a1182ba11f6: Consolidate concretization output for environments ## f73d7d2dce226857cbc774e942454bad2992969e: dd4hep: cleanup recipe, remove deprecated versions and patches ## cbab451c1a342523ed75e9be1098615a597a9b59: dd4hep: Add version 1.29 @@ -55,3 +56,4 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ## 3b59817ea7be35f4222dc88313734f7a30733ad7: deal with TimeoutError from ssl.py ## 737b70cbbfacb3fba8054426e9b5bf8ede6d8faf: Buildcache: remove deprecated --allow-root and preview subcommand ## a66586d749197841bd74e289802126f2359287a8: spack buildcache push: best effort +## 7503a417731910d918a7863d1862f62c9b76429d: cuda: add v12.4.1