From 9be768d62bbf331db5a0b82b625b6f2a977891f3 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 29 Jun 2024 00:26:33 +0000
Subject: [PATCH] chore: dd4hep-1.29
---
eic-spack.sh | 2 +-
spack-environment/packages.yaml | 2 +-
spack.sh | 6 +++++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/eic-spack.sh b/eic-spack.sh
index d4548e08c..d34c34254 100644
--- a/eic-spack.sh
+++ b/eic-spack.sh
@@ -3,4 +3,4 @@ EICSPACK_ORGREPO="eic/eic-spack"
## EIC spack commit hash or github version, e.g. v0.19.7
## note: nightly builds could use a branch e.g. releases/v0.19
-EICSPACK_VERSION="aa59daf2788cb8605c96819c3dedbdcd2e32c157"
+EICSPACK_VERSION="5823ee8e20515529539f3e1a792913b90bf21202"
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index 99f33b7e1..378d20c47 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -76,7 +76,7 @@ packages:
- '@1_54a'
dd4hep:
require:
- - '@1.28'
+ - '@1.29'
- +ddg4 +ddcad +hepmc3 +utilityapps +xercesc
- any_of: [+ddeve, -ddeve]
dpmjet:
diff --git a/spack.sh b/spack.sh
index 5d11bb4b7..d431e6f97 100644
--- a/spack.sh
+++ b/spack.sh
@@ -14,6 +14,8 @@ f6d50f790ee8b123f7775429f6ca6394170e6de9
9bcc43c4c158639fa6cb575c6106595a34682081
9f3e45ddbee24aaa7993e575297827e0aed2e6fe
85f13442d2a7486daba81fdd9a3b6a1182ba11f6
+f73d7d2dce226857cbc774e942454bad2992969e
+cbab451c1a342523ed75e9be1098615a597a9b59
---
## Optional hash table with comma-separated file list
read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
@@ -26,4 +28,6 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
## 63f6e6079aacc99078386e5c8ff06173841b9595: gaudi: upstream patch when @38.1 for missing #include <list>
## 9bcc43c4c158639fa6cb575c6106595a34682081: protobuf: update hash for patch needed when="@3.4:3.21"
## 9f3e45ddbee24aaa7993e575297827e0aed2e6fe: acts: pass cuda_arch to CMAKE_CUDA_ARCHITECTURES
-## 85f13442d2a7486daba81fdd9a3b6a1182ba11f6: Consolidate concretization output for environments
\ No newline at end of file
+## 85f13442d2a7486daba81fdd9a3b6a1182ba11f6: Consolidate concretization output for environments
+## f73d7d2dce226857cbc774e942454bad2992969e: dd4hep: cleanup recipe, remove deprecated versions and patches
+## cbab451c1a342523ed75e9be1098615a597a9b59: dd4hep: Add version 1.29
--
GitLab