use today's master for dd4hep

containers/jug/dev.Dockerfile

@@ -82,8 +82,8 @@ RUN echo "repos:" > $SPACK_ROOT/etc/spack/repos.yaml                    \
 
 ## Optional, normally commented out:
 ## Nuke the buildcache
-RUN --mount=type=cache,target=/var/cache/spack-mirror                   \
-  rm -rf /var/cache/spack-mirror/*
+#RUN --mount=type=cache,target=/var/cache/spack-mirror                   \
+#  rm -rf /var/cache/spack-mirror/*
 
 ## This variable will change whenevery either spack.yaml or our spack package
 ## overrides change, triggering a rebuild

spack.yaml

@@ -24,7 +24,7 @@ spack:
     - cairo@1.16.0 +fc+ft+X+pdf+gobject
     - podio@0.13.1
     - geant4@10.7.1 cxxstd=17 +opengl +vecgeom +x11 +qt +threads ^qt +opengl
-    - dd4hep@1.17.0p1 +geant4 +assimp +hepmc3 +ipo +lcio
+    - dd4hep@2021-07-21 +geant4 +assimp +hepmc3 +ipo +lcio
     - acts@8.03.0p1 +dd4hep +digitization +identification +json +tgeo +ipo
     - genfit@2.00.00
     - gaudi@36.0

spack/packages/dd4hep/package.py

@@ -24,7 +24,7 @@ class Dd4hep(CMakePackage):
     tags = ['hep']
 
     version('master', branch='master')
-    version('1.17.0p1', sha256='036a9908aaf1e13eaf5f2f43b6f5f4a8bdda8183ddc5befa77a4448dbb485826')
+    version('2021-07-27', commit='f2da87ba9366e5ad1a4ff0369788d61e05c62dd0', sha256='036a9908aaf1e13eaf5f2f43b6f5f4a8bdda8183ddc5befa77a4448dbb485826')
     version('1.17', sha256='036a9908aaf1e13eaf5f2f43b6f5f4a8bdda8183ddc5befa77a4448dbb485826')
     version('1.16.1', sha256='c8b1312aa88283986f89cc008d317b3476027fd146fdb586f9f1fbbb47763f1a')
     version('1.16', sha256='ea9755cd255cf1b058e0e3cd743101ca9ca5ff79f4c60be89f9ba72b1ae5ec69')
@@ -49,11 +49,7 @@ class Dd4hep(CMakePackage):
     # Workaround for failing build file generation in some cases
     # See https://github.com/spack/spack/issues/24232
     patch('cmake_language.patch', when='@:1.17')
-
-    # Patch to incorporate Whit's recent PRs merged into the DD4hep master
-    # https://github.com/AIDASoft/DD4hep/pull/849
-    # https://github.com/AIDASoft/DD4hep/pull/851
-    patch('backport.patch', when='@1.17.0p1')
+    patch('cmake_language.patch', when='@2021-07-27')
 
     variant('xercesc', default=False, description="Enable 'Detector Builders' based on XercesC")
     variant('geant4', default=False, description="Enable the simulation part based on Geant4")