From 8e4b6294ddad496de2b2c2bed5c483c551b4ec31 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 15 Feb 2022 00:55:10 +0000
Subject: [PATCH] dd4hep: new versions 1.19 and 1.20
---
spack.yaml | 2 +-
spack/packages/dd4hep/package.py | 12 +++---------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/spack.yaml b/spack.yaml
index 6a1bd9177..b5b50486e 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -6,7 +6,7 @@ spack:
- cmake@3.21.4
- dawn@3_91a
- dawncut@1_54a
- - dd4hep@1.18 +geant4 -assimp +hepmc3 +ipo +lcio
+ - dd4hep@1.20 +geant4 -assimp +hepmc3 +ipo +lcio
- eigen@3.4.0
- emacs@27.2 toolkit=athena
- fastjet@3.3.3
diff --git a/spack/packages/dd4hep/package.py b/spack/packages/dd4hep/package.py
index 6e7341e45..7e3e5d482 100644
--- a/spack/packages/dd4hep/package.py
+++ b/spack/packages/dd4hep/package.py
@@ -3,12 +3,6 @@ from spack.pkg.builtin.dd4hep import Dd4hep as BuiltinDd4hep
class Dd4hep(BuiltinDd4hep):
- # custom hash for the 2021-07-27 version, needed to include
- # https://github.com/AIDASoft/DD4hep/pull/849
- # https://github.com/AIDASoft/DD4hep/pull/851
- patch('2021-07-27.patch', when='@1.17')
- # patch for https://github.com/AIDASoft/DD4hep/issues/862
- patch('0001-do-not-change-momentum-in-getParticleDirection.patch', when='@1.17:1.18')
- # hack to fix refcount underflow
- patch('refcount_underflow.patch', when='@1.17:')
- patch('pdg.patch', when='@1.17:')
+ version('1.20', sha256='cf6af0c486d5c84e8c8a8e40ea16cec54d4ed78bffcef295a0eeeaedf51cab59')
+ version('1.19', sha256='d2eccf5e8402ba7dab2e1d7236e12ee4db9b1c5e4253c40a140bf35580db1d9b')
+
--
GitLab