From 3b5efe59d4810b2d14157dc46efe2fe36dba44cf Mon Sep 17 00:00:00 2001
From: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>
Date: Tue, 8 Oct 2024 14:56:51 +0200
Subject: [PATCH] Add missing tags and a cherry pick (#659)

---
 .cherry-pick                                  |  25 +++-
 .github/workflows/concretize.yaml             |   2 +-
 environments/key4hep-common-dbg/packages.yaml | 126 ++++++++++++++++++
 environments/key4hep-common-opt/packages.yaml | 126 ++++++++++++++++++
 .../key4hep-nightly-dbg/packages.yaml         | 126 ------------------
 environments/key4hep-nightly-dbg/spack.yaml   |   1 +
 .../key4hep-nightly-opt/packages.yaml         | 126 ------------------
 environments/key4hep-nightly-opt/spack.yaml   |   1 +
 .../packages.yaml                             |   0
 environments/key4hep-release-dbg/spack.yaml   |  15 +++
 .../key4hep-release-opt/packages.yaml         |   3 +
 .../spack.yaml                                |   1 +
 packages/ced/package.py                       |   4 +
 packages/cedviewer/package.py                 |   4 +
 packages/cldconfig/package.py                 |  12 +-
 packages/gear/package.py                      |   5 +
 packages/ilcutil/package.py                   |   4 +
 packages/k4fwcore/package.py                  |   6 +-
 packages/k4generatorsconfig/package.py        |   7 +-
 packages/k4geo/package.py                     |   7 +-
 packages/k4reco/package.py                    |   4 +-
 scripts/cvmfs/setup-releases.sh               |  37 ++---
 scripts/delete-unused.sh                      |   4 +-
 scripts/fetch_nightly_versions.py             |   7 +
 24 files changed, 363 insertions(+), 290 deletions(-)
 create mode 100644 environments/key4hep-common-dbg/packages.yaml
 create mode 100644 environments/key4hep-common-opt/packages.yaml
 rename environments/{key4hep-release => key4hep-release-dbg}/packages.yaml (100%)
 create mode 100644 environments/key4hep-release-dbg/spack.yaml
 create mode 100644 environments/key4hep-release-opt/packages.yaml
 rename environments/{key4hep-release => key4hep-release-opt}/spack.yaml (91%)

diff --git a/.cherry-pick b/.cherry-pick
index 2797ea1b..24359c39 100644
--- a/.cherry-pick
+++ b/.cherry-pick
@@ -11,7 +11,7 @@ git cherry-pick 42c070632bcb0f8333bc029e17a53646d9589d7e -X theirs --no-commit
 # protobuf in CMAKE_INSTALL_LIBDIR which is lib64 so a symlink is created here
 git cherry-pick 3ec184fad8582cc501f55e0ea0b0f6b3fb9b70bf -X theirs --no-commit
 
-# add a recent version of madgraph, remove when https://github.com/spack/spack/pull/41128 is merged
+# add a recent version of madgraph, remove!
 curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/41128.diff | patch -p1
 
 # add vdt for CPATH, needed for podio+rntuple
@@ -32,29 +32,42 @@ git cherry-pick c8191268c3ea4aca6e870ad40d695e92f94d0e47 -X theirs --no-commit
 # zziplib: add 0.13.78, remove!
 git cherry-pick db5538f5f12de8d1599ef4339e2dd1756d1230ad -X theirs --no-commit
 
-# pybind11: fix pkgconfig, remove when https://github.com/spack/spack/pull/46298 is merged
+# pybind11: fix pkgconfig, remove!
 curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46298.diff | patch -p1
 
-# gaudi: add patches, remove when https://github.com/spack/spack/pull/46365 is merged
+# gaudi: add patches, remove!
 curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46365.diff | patch -p1
 
 # py-awkward and py-awkward-cpp: fixes, remove!
 curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46372.diff | patch -p1
 
 # py-onnx: add fixes for GCC 14, remove!
-curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46390.diff | patch -p1
+# curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46390.diff | patch -p1
+git cherry-pick 096ab11961995ac8d69f7b177cbcadf618d3068e -X theirs --no-commit
 
 # texlive: add new versions, remove!
 git cherry-pick 5398b1be15245e1be480c5aa4706f57795208505 -X theirs --no-commit
 
-# texlive: fix mtxrun, remove when https://github.com/spack/spack/pull/46465 is merged
+# texlive: fix mtxrun, remove!
 curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46465.diff | patch -p1
 
 # py-onnx: add a patch for the standard, remove after 1.15.0
 git add .
 git cherry-pick 248a7c0f4894222bfcd0bb76b13a984c92d4c938 -X theirs --no-commit
 
-# Versions for the release, in order DD4hep and podio&edm4hep
+# py-cython: add version 3.0.11, remove when https://github.com/spack/spack/pull/46772 is merged
+git cherry-pick 072d308c0b4b53c0d0528ee3a7e59de110133968 -X theirs --no-commit
+# py-lxml: add version 5.3.0, remove when https://github.com/spack/spack/pull/46771 is merged
+git cherry-pick 94ef87d013b3ea9627c1aa850b8929dbe217bf20 -X theirs --no-commit
+
+# madgraph5amc: add v3.5.6, remove!
+git cherry-pick 5777576e37ee28d674e2520d3f10b3f651a7680e -X theirs --no-commit
+
+# py-gevent: add a patch for cython 3.0.10 and 3.0.11, remove!
+git cherry-pick 06f21ae4e2499bccaa6c52359bafbb93c161944b -X theirs --no-commit
+
+# Versions for the release, in order DD4hep and podio&edm4hep and LCIO
 git cherry-pick 43d1cdb0bd4780bff369dafa681a8a7939313784 -X theirs --no-commit
 git cherry-pick 5d9c534018593fdef5db1028c60026d26bf4d65b -X theirs --no-commit
 git cherry-pick be8112e1ff9dea12296bfafb341cc5953e72c415 -X theirs --no-commit
+git cherry-pick 1c6b6d0a0819409b75d7a59a90c3daf24fe80fee -X theirs --no-commit
diff --git a/.github/workflows/concretize.yaml b/.github/workflows/concretize.yaml
index 423b5629..4c0482ee 100644
--- a/.github/workflows/concretize.yaml
+++ b/.github/workflows/concretize.yaml
@@ -49,7 +49,7 @@ jobs:
             source /key4hep-spack/.cherry-pick
 
             if [ "${{ matrix.build_type }}" = "release" ]; then
-                env=key4hep-release
+                env=key4hep-release-opt
             elif [ "${{ matrix.build_type }}" = "nightly" ]; then
                 env=key4hep-nightly-opt
                 pip3 install pyyaml
diff --git a/environments/key4hep-common-dbg/packages.yaml b/environments/key4hep-common-dbg/packages.yaml
new file mode 100644
index 00000000..820ebef8
--- /dev/null
+++ b/environments/key4hep-common-dbg/packages.yaml
@@ -0,0 +1,126 @@
+packages:
+  acts:
+    require: build_type=Debug
+  aidatt:
+    require: build_type=Debug
+  ced:
+    require: build_type=Debug
+  cedviewer:
+    require: build_type=Debug
+  cepcsw:
+    require: build_type=Debug
+  clicperformance:
+    require: build_type=Debug
+  conformaltracking:
+    require: build_type=Debug
+  dd4hep:
+    require: build_type=Debug
+  ddfastshowerml:
+    require: build_type=Debug
+  ddkaltest:
+    require: build_type=Debug
+  ddmarlinpandora:
+    require: build_type=Debug
+  delphes:
+    require: build_type=Debug
+  dual-readout:
+    require: build_type=Debug
+  edm4hep:
+    require: build_type=Debug cxxstd=20
+  fcalclusterer:
+    require: build_type=Debug
+  fccanalyses:
+    require: build_type=Debug
+  fccdetectors:
+    require: build_type=Debug
+  fccsw:
+    require: build_type=Debug
+  forwardtracking:
+    require: build_type=Debug
+  gaudi:
+    require: build_type=Debug
+  gear:
+    require: build_type=Debug
+  ilcutil:
+    require: build_type=Debug cxxstd=20
+  ildperformance:
+    require: build_type=Debug
+  key4hep-stack:
+    require: build_type=Debug
+  k4clue:
+    require: build_type=Debug
+  k4edm4hep2lcioconv:
+    require: build_type=Debug
+  k4fwcore:
+    require: build_type=Debug
+  k4gaudipandora:
+    require: build_type=Debug
+  k4gen:
+    require: build_type=Debug
+  k4generatorsconfig:
+    require: build_type=Debug
+  k4geo:
+    require: build_type=Debug
+  k4marlinwrapper:
+    require: build_type=Debug
+  k4projecttemplate:
+    require: build_type=Debug
+  k4reccalorimeter:
+    require: build_type=Debug
+  k4reco:
+    require: build_type=Debug
+  k4rectracker:
+    require: build_type=Debug
+  k4simdelphes:
+    require: build_type=Debug
+  k4simgeant4:
+    require: build_type=Debug
+  kaltest:
+    require: build_type=Debug
+  kitrack:
+    require: build_type=Debug
+  kitrackmarlin:
+    require: build_type=Debug
+  lccd:
+    require: build_type=Debug
+  lcfiplus:
+    require: build_type=Debug
+  lcio:
+    require: build_type=Debug cxxstd=20
+  lctuple:
+    require: build_type=Debug
+  marlin:
+    require: build_type=Debug
+  marlindd4hep:
+    require: build_type=Debug
+  marlinfastjet:
+    require: build_type=Debug
+  marlinkinfit:
+    require: build_type=Debug
+  marlinkinfitprocessors:
+    require: build_type=Debug
+  marlinmlflavortagging:
+    require: build_type=Debug
+  marlinreco:
+    require: build_type=Debug
+  marlintrk:
+    require: build_type=Debug
+  marlintrkprocessors:
+    require: build_type=Debug
+  marlinutil:
+    require: build_type=Debug
+  opendatadetector:
+    require: build_type=Debug
+  overlay:
+    require: build_type=Debug
+  pandoraanalysis:
+    require: build_type=Debug
+  physsim:
+    require: build_type=Debug
+  podio:
+    require: build_type=Debug
+  raida:
+    require: build_type=Debug
+  sio:
+    require: build_type=Debug cxxstd=20
+
diff --git a/environments/key4hep-common-opt/packages.yaml b/environments/key4hep-common-opt/packages.yaml
new file mode 100644
index 00000000..31f5aa39
--- /dev/null
+++ b/environments/key4hep-common-opt/packages.yaml
@@ -0,0 +1,126 @@
+packages:
+  acts:
+    require: build_type=Release
+  aidatt:
+    require: build_type=Release
+  ced:
+    require: build_type=Release
+  cedviewer:
+    require: build_type=Release
+  cepcsw:
+    require: build_type=Release
+  clicperformance:
+    require: build_type=Release
+  conformaltracking:
+    require: build_type=Release
+  dd4hep:
+    require: build_type=Release
+  ddfastshowerml:
+    require: build_type=Release
+  ddkaltest:
+    require: build_type=Release
+  ddmarlinpandora:
+    require: build_type=Release
+  delphes:
+    require: build_type=Release
+  dual-readout:
+    require: build_type=Release
+  edm4hep:
+    require: build_type=Release cxxstd=20
+  fcalclusterer:
+    require: build_type=Release
+  fccanalyses:
+    require: build_type=Release
+  fccdetectors:
+    require: build_type=Release
+  fccsw:
+    require: build_type=Release
+  forwardtracking:
+    require: build_type=Release
+  gaudi:
+    require: build_type=Release
+  gear:
+    require: build_type=Release
+  ilcutil:
+    require: build_type=Release cxxstd=20
+  ildperformance:
+    require: build_type=Release
+  key4hep-stack:
+    require: build_type=Release
+  k4clue:
+    require: build_type=Release
+  k4edm4hep2lcioconv:
+    require: build_type=Release
+  k4fwcore:
+    require: build_type=Release
+  k4gaudipandora:
+    require: build_type=Release
+  k4gen:
+    require: build_type=Release
+  k4generatorsconfig:
+    require: build_type=Release
+  k4geo:
+    require: build_type=Release
+  k4marlinwrapper:
+    require: build_type=Release
+  k4projecttemplate:
+    require: build_type=Release
+  k4reccalorimeter:
+    require: build_type=Release
+  k4reco:
+    require: build_type=Release
+  k4rectracker:
+    require: build_type=Release
+  k4simdelphes:
+    require: build_type=Release
+  k4simgeant4:
+    require: build_type=Release
+  kaltest:
+    require: build_type=Release
+  kitrack:
+    require: build_type=Release
+  kitrackmarlin:
+    require: build_type=Release
+  lccd:
+    require: build_type=Release
+  lcfiplus:
+    require: build_type=Release
+  lcio:
+    require: build_type=Release cxxstd=20
+  lctuple:
+    require: build_type=Release
+  marlin:
+    require: build_type=Release
+  marlindd4hep:
+    require: build_type=Release
+  marlinfastjet:
+    require: build_type=Release
+  marlinkinfit:
+    require: build_type=Release
+  marlinkinfitprocessors:
+    require: build_type=Release
+  marlinmlflavortagging:
+    require: build_type=Release
+  marlinreco:
+    require: build_type=Release
+  marlintrk:
+    require: build_type=Release
+  marlintrkprocessors:
+    require: build_type=Release
+  marlinutil:
+    require: build_type=Release
+  opendatadetector:
+    require: build_type=Release
+  overlay:
+    require: build_type=Release
+  pandoraanalysis:
+    require: build_type=Release
+  physsim:
+    require: build_type=Release
+  podio:
+    require: build_type=Release
+  raida:
+    require: build_type=Release
+  sio:
+    require: build_type=Release cxxstd=20
+
diff --git a/environments/key4hep-nightly-dbg/packages.yaml b/environments/key4hep-nightly-dbg/packages.yaml
index 66d9a4e2..efa79a7f 100644
--- a/environments/key4hep-nightly-dbg/packages.yaml
+++ b/environments/key4hep-nightly-dbg/packages.yaml
@@ -1,129 +1,3 @@
 packages:
-  acts:
-    require: build_type=Debug
-  aidatt:
-    require: build_type=Debug
-  ced:
-    require: build_type=Debug
-  cedviewer:
-    require: build_type=Debug
-  cepcsw:
-    require: build_type=Debug
-  clicperformance:
-    require: build_type=Debug
-  conformaltracking:
-    require: build_type=Debug
-  dd4hep:
-    require: build_type=Debug
-  ddfastshowerml:
-    require: build_type=Debug
-  ddkaltest:
-    require: build_type=Debug
-  ddmarlinpandora:
-    require: build_type=Debug
-  delphes:
-    require: build_type=Debug
-  dual-readout:
-    require: build_type=Debug
-  edm4hep:
-    require: build_type=Debug cxxstd=20
-  fcalclusterer:
-    require: build_type=Debug
-  fccanalyses:
-    require: build_type=Debug
-  fccdetectors:
-    require: build_type=Debug
-  fccsw:
-    require: build_type=Debug
-  forwardtracking:
-    require: build_type=Debug
-  gaudi:
-    require: build_type=Debug
-  gear:
-    require: build_type=Debug
-  ilcutil:
-    require: build_type=Debug cxxstd=20
-  ildperformance:
-    require: build_type=Debug
-  key4hep-stack:
-    require: build_type=Debug
-  k4clue:
-    require: build_type=Debug
-  k4edm4hep2lcioconv:
-    require: build_type=Debug
-  k4fwcore:
-    require: build_type=Debug
-  k4gaudipandora:
-    require: build_type=Debug
-  k4gen:
-    require: build_type=Debug
-  k4generatorsconfig:
-    require: build_type=Debug
-  k4geo:
-    require: build_type=Debug
-  k4marlinwrapper:
-    require: build_type=Debug
-  k4projecttemplate:
-    require: build_type=Debug
-  k4reccalorimeter:
-    require: build_type=Debug
-  k4reco:
-    require: build_type=Debug
-  k4rectracker:
-    require: build_type=Debug
-  k4simdelphes:
-    require: build_type=Debug
-  k4simgeant4:
-    require: build_type=Debug
-  kaltest:
-    require: build_type=Debug
-  kitrack:
-    require: build_type=Debug
-  kitrackmarlin:
-    require: build_type=Debug
-  lccd:
-    require: build_type=Debug
-  lcfiplus:
-    require: build_type=Debug
-  lcio:
-    require: build_type=Debug cxxstd=20
-  lctuple:
-    require: build_type=Debug
-  marlin:
-    require: build_type=Debug
-  marlindd4hep:
-    require: build_type=Debug
-  marlinfastjet:
-    require: build_type=Debug
-  marlinkinfit:
-    require: build_type=Debug
-  marlinkinfitprocessors:
-    require: build_type=Debug
-  marlinmlflavortagging:
-    require: build_type=Debug
-  marlinreco:
-    require: build_type=Debug
-  marlintrk:
-    require: build_type=Debug
-  marlintrkprocessors:
-    require: build_type=Debug
-  marlinutil:
-    require: build_type=Debug
-  opendatadetector:
-    require: build_type=Debug
-  overlay:
-    require: build_type=Debug
-  pandoraanalysis:
-    require: build_type=Debug
-  physsim:
-    require: build_type=Debug
-  podio:
-    require: build_type=Debug
-  raida:
-    require: build_type=Debug
-  sio:
-    require: build_type=Debug cxxstd=20
-
   whizard:
     require: ~fastjet+latex+lcio~lhapdf+openloops+openmp+pythia8+gosam hepmc=3
-
diff --git a/environments/key4hep-nightly-dbg/spack.yaml b/environments/key4hep-nightly-dbg/spack.yaml
index 9507cf06..1ef1554e 100644
--- a/environments/key4hep-nightly-dbg/spack.yaml
+++ b/environments/key4hep-nightly-dbg/spack.yaml
@@ -5,6 +5,7 @@ spack:
   # Put packages before the common packages so that it doesn't get overwritten
   # See https://github.com/spack/spack/blob/master/lib/spack/docs/environments.rst?plain=1#L528
   - ./packages.yaml
+  - ../key4hep-common-dbg/packages.yaml
   - ../key4hep-common/packages.yaml
   - ../key4hep-common/compilers.yaml
   - ../key4hep-nightly-share/packages.yaml
diff --git a/environments/key4hep-nightly-opt/packages.yaml b/environments/key4hep-nightly-opt/packages.yaml
index d1d97741..efa79a7f 100644
--- a/environments/key4hep-nightly-opt/packages.yaml
+++ b/environments/key4hep-nightly-opt/packages.yaml
@@ -1,129 +1,3 @@
 packages:
-  acts:
-    require: build_type=Release
-  aidatt:
-    require: build_type=Release
-  ced:
-    require: build_type=Release
-  cedviewer:
-    require: build_type=Release
-  cepcsw:
-    require: build_type=Release
-  clicperformance:
-    require: build_type=Release
-  conformaltracking:
-    require: build_type=Release
-  dd4hep:
-    require: build_type=Release
-  ddfastshowerml:
-    require: build_type=Release
-  ddkaltest:
-    require: build_type=Release
-  ddmarlinpandora:
-    require: build_type=Release
-  delphes:
-    require: build_type=Release
-  dual-readout:
-    require: build_type=Release
-  edm4hep:
-    require: build_type=Release cxxstd=20
-  fcalclusterer:
-    require: build_type=Release
-  fccanalyses:
-    require: build_type=Release
-  fccdetectors:
-    require: build_type=Release
-  fccsw:
-    require: build_type=Release
-  forwardtracking:
-    require: build_type=Release
-  gaudi:
-    require: build_type=Release
-  gear:
-    require: build_type=Release
-  ilcutil:
-    require: build_type=Release cxxstd=20
-  ildperformance:
-    require: build_type=Release
-  key4hep-stack:
-    require: build_type=Release
-  k4clue:
-    require: build_type=Release
-  k4edm4hep2lcioconv:
-    require: build_type=Release
-  k4fwcore:
-    require: build_type=Release
-  k4gaudipandora:
-    require: build_type=Release
-  k4gen:
-    require: build_type=Release
-  k4generatorsconfig:
-    require: build_type=Release
-  k4geo:
-    require: build_type=Release
-  k4marlinwrapper:
-    require: build_type=Release
-  k4projecttemplate:
-    require: build_type=Release
-  k4reccalorimeter:
-    require: build_type=Release
-  k4reco:
-    require: build_type=Release
-  k4rectracker:
-    require: build_type=Release
-  k4simdelphes:
-    require: build_type=Release
-  k4simgeant4:
-    require: build_type=Release
-  kaltest:
-    require: build_type=Release
-  kitrack:
-    require: build_type=Release
-  kitrackmarlin:
-    require: build_type=Release
-  lccd:
-    require: build_type=Release
-  lcfiplus:
-    require: build_type=Release
-  lcio:
-    require: build_type=Release cxxstd=20
-  lctuple:
-    require: build_type=Release
-  marlin:
-    require: build_type=Release
-  marlindd4hep:
-    require: build_type=Release
-  marlinfastjet:
-    require: build_type=Release
-  marlinkinfit:
-    require: build_type=Release
-  marlinkinfitprocessors:
-    require: build_type=Release
-  marlinmlflavortagging:
-    require: build_type=Release
-  marlinreco:
-    require: build_type=Release
-  marlintrk:
-    require: build_type=Release
-  marlintrkprocessors:
-    require: build_type=Release
-  marlinutil:
-    require: build_type=Release
-  opendatadetector:
-    require: build_type=Release
-  overlay:
-    require: build_type=Release
-  pandoraanalysis:
-    require: build_type=Release
-  physsim:
-    require: build_type=Release
-  podio:
-    require: build_type=Release
-  raida:
-    require: build_type=Release
-  sio:
-    require: build_type=Release cxxstd=20
-
   whizard:
     require: ~fastjet+latex+lcio~lhapdf+openloops+openmp+pythia8+gosam hepmc=3
-
diff --git a/environments/key4hep-nightly-opt/spack.yaml b/environments/key4hep-nightly-opt/spack.yaml
index 9507cf06..ed2ef2db 100644
--- a/environments/key4hep-nightly-opt/spack.yaml
+++ b/environments/key4hep-nightly-opt/spack.yaml
@@ -5,6 +5,7 @@ spack:
   # Put packages before the common packages so that it doesn't get overwritten
   # See https://github.com/spack/spack/blob/master/lib/spack/docs/environments.rst?plain=1#L528
   - ./packages.yaml
+  - ../key4hep-common-opt/packages.yaml
   - ../key4hep-common/packages.yaml
   - ../key4hep-common/compilers.yaml
   - ../key4hep-nightly-share/packages.yaml
diff --git a/environments/key4hep-release/packages.yaml b/environments/key4hep-release-dbg/packages.yaml
similarity index 100%
rename from environments/key4hep-release/packages.yaml
rename to environments/key4hep-release-dbg/packages.yaml
diff --git a/environments/key4hep-release-dbg/spack.yaml b/environments/key4hep-release-dbg/spack.yaml
new file mode 100644
index 00000000..884cd090
--- /dev/null
+++ b/environments/key4hep-release-dbg/spack.yaml
@@ -0,0 +1,15 @@
+spack:
+  view: false
+  include:
+  - ../key4hep-common/config-release.yaml
+  # Put packages before the common packages so that it doesn't get overwritten
+  # See https://github.com/spack/spack/blob/master/lib/spack/docs/environments.rst?plain=1#L528
+  - ./packages.yaml
+  - ../key4hep-common-dbg/packages.yaml
+  - ../key4hep-common/packages.yaml
+  - ../key4hep-common/compilers.yaml
+  - ../key4hep-release-share/packages.yaml
+  repos:
+  - ../..
+  specs:
+  - key4hep-stack+devtools
\ No newline at end of file
diff --git a/environments/key4hep-release-opt/packages.yaml b/environments/key4hep-release-opt/packages.yaml
new file mode 100644
index 00000000..d178f5aa
--- /dev/null
+++ b/environments/key4hep-release-opt/packages.yaml
@@ -0,0 +1,3 @@
+packages:
+  whizard:
+    require: ~fastjet~latex+lcio~lhapdf+openloops+openmp+pythia8+gosam hepmc=3
diff --git a/environments/key4hep-release/spack.yaml b/environments/key4hep-release-opt/spack.yaml
similarity index 91%
rename from environments/key4hep-release/spack.yaml
rename to environments/key4hep-release-opt/spack.yaml
index e71e740b..ec8eeb8e 100644
--- a/environments/key4hep-release/spack.yaml
+++ b/environments/key4hep-release-opt/spack.yaml
@@ -5,6 +5,7 @@ spack:
   # Put packages before the common packages so that it doesn't get overwritten
   # See https://github.com/spack/spack/blob/master/lib/spack/docs/environments.rst?plain=1#L528
   - ./packages.yaml
+  - ../key4hep-common-opt/packages.yaml
   - ../key4hep-common/packages.yaml
   - ../key4hep-common/compilers.yaml
   - ../key4hep-release-share/packages.yaml
diff --git a/packages/ced/package.py b/packages/ced/package.py
index ce45b0fe..c1fc20d9 100644
--- a/packages/ced/package.py
+++ b/packages/ced/package.py
@@ -17,6 +17,10 @@ class Ced(CMakePackage, Ilcsoftpackage):
     maintainers = ["vvolkl"]
 
     version("master", branch="master")
+    version(
+        "1.10",
+        sha256="c3c6540559c00d55bd5981816d39290dbb9b091e34673e301e42934988a74012",
+    )
     version(
         "1.9.4",
         sha256="9202eff8d02a35542e368a790d0c3bc81530f618f28f8f57929e29df52bf7634",
diff --git a/packages/cedviewer/package.py b/packages/cedviewer/package.py
index b8aa48d6..2bdf6a10 100644
--- a/packages/cedviewer/package.py
+++ b/packages/cedviewer/package.py
@@ -17,6 +17,10 @@ class Cedviewer(CMakePackage, Ilcsoftpackage):
     maintainers = ["vvolkl"]
 
     version("master", branch="master")
+    version(
+        "1.20",
+        sha256="e2b1b50b42be28aa28bbdba99e403e053a1aff7bcd7c76c6b7224768a3d28c68",
+    )
     version(
         "1.19.1",
         sha256="aaa5317ae35d11a2850d623667607fc130181ea500a596e3073f744deae0f8b6",
diff --git a/packages/cldconfig/package.py b/packages/cldconfig/package.py
index b7f0fcc3..cbb17a7b 100644
--- a/packages/cldconfig/package.py
+++ b/packages/cldconfig/package.py
@@ -11,13 +11,19 @@ class Cldconfig(CMakePackage):
 
     homepage = "https://github.com/key4hep/CLDConfig"
     git = "https://github.com/key4hep/CLDConfig"
+    url = "https://github.com/key4hep/CLDConfig/archive/refs/tags/r2024-10-06.tar.gz"
 
     maintainers = ["jmcarcell"]
 
     version("main", branch="main")
-    # Old tag to make sure there is at least one, can be removed when
-    # there is another
-    version("r2024-04-12", tag="r2024-04-12")
+    version(
+        "2024-10-06",
+        sha256="7ded5bc3f63eed6b6806d9581e1b47d7ca14a0c97ef5d61331d4ef88b1d7d643",
+    )
+    version(
+        "2024-04-12",
+        sha256="8a15971152391da3b41bbf543316ad6b41949cd3d3c82e334a7a7b86092591da",
+    )
 
     depends_on("k4geo", type="test")
     depends_on("dd4hep", type="test")
diff --git a/packages/gear/package.py b/packages/gear/package.py
index a3ef0a98..9458ccae 100644
--- a/packages/gear/package.py
+++ b/packages/gear/package.py
@@ -16,6 +16,11 @@ class Gear(CMakePackage, Ilcsoftpackage):
     maintainers = ["vvolkl"]
 
     version("master", branch="master")
+
+    version(
+        "1.9.3",
+        sha256="c6e9075dc6be63d9e3019ce8c636adfa4be2bffb8120b1d9d054a0830724aaed",
+    )
     version(
         "1.9.2",
         sha256="7ea9e13046aef53f12e4071e9937378c93f17fe70f8b673e91bbc3a81385742d",
diff --git a/packages/ilcutil/package.py b/packages/ilcutil/package.py
index 2cc02b65..3e96b3ba 100644
--- a/packages/ilcutil/package.py
+++ b/packages/ilcutil/package.py
@@ -16,6 +16,10 @@ class Ilcutil(CMakePackage, Ilcsoftpackage):
     maintainers = ["vvolkl"]
 
     version("master", branch="master")
+    version(
+        "1.7.3",
+        sha256="77ae96bf9b4ceda382a57048a7a6b0ab5e9120ac3f14ffd10441c9e44684f35b",
+    )
     version(
         "1.7.2",
         sha256="d909a575cc8be7d52446f58f1cc7be8eb5112a977b01c69c5e0d7c0b5cf8cdfb",
diff --git a/packages/k4fwcore/package.py b/packages/k4fwcore/package.py
index 8cd62293..673eac7d 100644
--- a/packages/k4fwcore/package.py
+++ b/packages/k4fwcore/package.py
@@ -5,14 +5,14 @@ class K4fwcore(CMakePackage, Ilcsoftpackage):
     """Core framework components of the Key4HEP project"""
 
     homepage = "https://github.com/key4hep/k4FWCore"
-    url = "https://github.com/key4hep/k4FWCore/archive/v00-01.tar.gz"
+    url = "https://github.com/key4hep/k4FWCore/archive/v00-01-00.tar.gz"
     git = "https://github.com/key4hep/k4FWCore.git"
 
     version("main", branch="main")
 
     version(
-        "1.1.0",
-        sha256="31b03daf5f839708113f3452c6626975aa8b070a7cbbb3576b29b86918df13d3",
+        "1.1",
+        sha256="63a81e5893571a5e9209e4b6f2fe6d511772675a824cfef105f2df5f18fc6af4",
     )
 
     version("1.0pre19", tag="v01-00pre19")
diff --git a/packages/k4generatorsconfig/package.py b/packages/k4generatorsconfig/package.py
index c1f523f7..aad97f05 100644
--- a/packages/k4generatorsconfig/package.py
+++ b/packages/k4generatorsconfig/package.py
@@ -9,8 +9,7 @@ class K4generatorsconfig(CMakePackage):
 
     homepage = "https://github.com/key4hep/k4GeneratorsConfig"
     git = "https://github.com/key4hep/k4GeneratorsConfig.git"
-    # To be changed once there is a first version
-    url = "https://github.com/key4hep/k4GeneratorsConfig.git/archive/v00-16-07.tar.gz"
+    url = "https://github.com/key4hep/k4GeneratorsConfig/archive/refs/tags/v0.1.tar.gz"
 
     generator = "Ninja"
 
@@ -18,6 +17,10 @@ class K4generatorsconfig(CMakePackage):
 
     version("main", branch="main")
 
+    version(
+        "0.1", sha256="0309f25bc4149de8c17a4615146074ece46f6f384a152e0fd05853ec652d9ad4"
+    )
+
     depends_on("podio")
     depends_on("edm4hep")
     depends_on("hepmc3")
diff --git a/packages/k4geo/package.py b/packages/k4geo/package.py
index 47030d33..3962c79f 100644
--- a/packages/k4geo/package.py
+++ b/packages/k4geo/package.py
@@ -18,14 +18,15 @@ class K4geo(CMakePackage):
     version("main", branch="main")
     version(
         "0.21",
-        sha256="11074495f861d944b741187e8e4dedb4e7f85124f304605f8f8c7dce69dda4fb",
+        sha256="0451e532fd22b2b9ea93a71f7036ea6de44386ecb10a84f28bc1d9fd557c6ad1",
+        url="https://github.com/key4hep/k4geo/archive/refs/tags/v00-21.tar.gz",
     )
     version(
-        "0.20",
+        "0.20.0",
         sha256="40d5842faa4767cc1b8c19f9b710713ba6a128ecd94fb9682e3afe3145e20511",
     )
     version(
-        "0.19",
+        "0.19.0",
         sha256="6e8101e5991870484988f9fcb0299076a30f9b5f37e4e51141e50dfd30f32314",
     )
 
diff --git a/packages/k4reco/package.py b/packages/k4reco/package.py
index 5e98c568..4bff01d3 100644
--- a/packages/k4reco/package.py
+++ b/packages/k4reco/package.py
@@ -5,14 +5,14 @@ class K4reco(CMakePackage, Key4hepPackage):
     """Reconstruction algorithms using Gaudi in native key4hep"""
 
     homepage = "https://github.com/key4hep/k4Reco"
-    url = "https://github.com/key4hep/k4Reco/archive/v00-01.tar.gz"
+    url = "https://github.com/key4hep/k4Reco/archive/v00-01-00.tar.gz"
     git = "https://github.com/key4hep/k4Reco.git"
 
     version("main", branch="main")
 
     version(
         "0.1.0",
-        sha256="93ee8a66aeb31ed501a356a145551f9836fb744e22b435c6577ea5274ece39c6",
+        sha256="6309de6cb083f1d263c40b99f06b47b774d485dc5361f98dad2f6e111376d69e",
     )
 
     depends_on("dd4hep")
diff --git a/scripts/cvmfs/setup-releases.sh b/scripts/cvmfs/setup-releases.sh
index cbe4209f..296e8363 100644
--- a/scripts/cvmfs/setup-releases.sh
+++ b/scripts/cvmfs/setup-releases.sh
@@ -40,8 +40,9 @@ function list_releases() {
         usage
         return 1
     fi
-    find /cvmfs/sw.hsf.org/key4hep/releases/ -maxdepth 2 -type d -name "*$name*$build_type*" |
+    find /cvmfs/sw.hsf.org/key4hep/releases/ -maxdepth 2 -type d -name "*$name*$compiler*$build_type*" |
     \awk -F/ '{print $(NF-1)}' | sort
+    unset compiler
 }
 
 function list_packages() {
@@ -79,29 +80,32 @@ function list_packages() {
     fi
     folders+=(/cvmfs/sw.hsf.org/key4hep/releases/$rel/*$name*-*$build_type*)
 
-    declare -a package_versions
-    package_versions=()
+    declare -A package_versions
 
     for folder in "${folders[@]}"; do
         for package in $(ls $folder); do
             package_name=$(basename "$package")
             version_string=$(ls $folder/$package_name -t | head -n 1)
             package_version=$(echo "$version_string" | awk '{if ($NF ~ /develop/) {split($NF,arr,"_"); printf "%s", arr[1]} else {split($(NF),arr,"-"); printf "%s", arr[1]; for (i=2; i<length(arr); i++) printf "-%s", arr[i] } printf "\n" }')
-
-            # Update the version of the package in the associative array
-            if [[ " ${package_versions[@]} " =~ "${package_name}" ]]; then
-                package_versions=("${package_versions[@]/$package_name=*/$package_name=$package_version}")
-            else
-                package_versions+=("$package_name=$package_version")
-            fi
+            package_versions["$package_name"]="$package_version"
         done
     done
 
-    # Print the final version of each package
-    for pair in "${package_versions[@]}"; do
-        echo ${pair%%=*} ${pair#*=}
-    done
+    # Print the final version for each package
+    if [ -z "$ZSH_VERSION" ]; then
+        # Bash
+        for package_name in $(printf "%s\n" "${!package_versions[@]}" | sort); do
+            package_version="${package_versions[$package_name]}"
+            echo "$package_name $package_version"
+        done
+    else
+        # Zsh
+        for key in ${(ok)package_versions}; do
+            echo "$key $package_versions[$key]" | tr -d '"'
+        done
+    fi
 
+    unset compiler
 }
 
 
@@ -255,7 +259,7 @@ for ((i=1; i<=$#; i++)); do
     esac
 done
 
-k4path=$(/usr/bin/ls -rd /cvmfs/sw.hsf.org/key4hep/releases/$rel/*$os*$build_type | head -n1)
+k4path=$(/usr/bin/ls -rd /cvmfs/sw-nightlies.hsf.org/key4hep/releases/$rel/*$os*$compiler*$build_type | head -n1)
 
 if [ -n "$KEY4HEP_STACK" ]; then
     echo "The Key4hep software stack is already set up, please start a new shell to avoid conflicts"
@@ -265,7 +269,7 @@ fi
 if [ "$os" = "centos7" ]; then
     echo "Centos/RHEL 7 detected"
     if [ "$rel" = "latest" ]; then
-        echo "This OS will reach the end of its maintenance support soon and won't have Key4hep builds in the future, consider upgrading to Alma 9"
+        echo "This OS has reached the end of its maintenance support and won't have Key4hep builds in the future, consider upgrading to Alma 9"
     fi
 elif [ "$os" = "almalinux9" ]; then
     echo "AlmaLinux/RockyLinux/RHEL 9 detected"
@@ -301,3 +305,4 @@ echo "        $command"
 echo ""
 echo "If you have any issues, comments or requests, open an issue at https://github.com/key4hep/key4hep-spack/issues"
 source ${setup_actual}
+echo "Tip: A new -d flag can be used to access debug builds, otherwise the default is the optimized build"
diff --git a/scripts/delete-unused.sh b/scripts/delete-unused.sh
index ce76d29f..2da61517 100755
--- a/scripts/delete-unused.sh
+++ b/scripts/delete-unused.sh
@@ -1,7 +1,7 @@
 # This will delete unused (from example from a previous failed installation) specs that
 # are no longer in the current installation
-spack -e . python -c 'from spack.cmd import uninstall; uninstall.do_uninstall([x for x in spack.store.STORE.db.query_local() if not any(x.satisfies(y) for y in spack.environment.active_environment().all_specs_generator())], False)'
+spack python -c 'from spack.cmd import uninstall; uninstall.do_uninstall([x for x in spack.store.STORE.db.query_local() if not any(x.satisfies(y) for y in spack.environment.active_environment().all_specs_generator())], False)'
 
 # Same command but only print what would be deleted
-# spack -e . python -c 'print([x.name for x in spack.store.STORE.db.query_local() if not any(x.satisfies(y) for y in spack.environment.active_environment().all_specs_generator())])'
+# spack python -c 'print([x.name for x in spack.store.STORE.db.query_local() if not any(x.satisfies(y) for y in spack.environment.active_environment().all_specs_generator())])'
 
diff --git a/scripts/fetch_nightly_versions.py b/scripts/fetch_nightly_versions.py
index b8422003..c62dfec0 100755
--- a/scripts/fetch_nightly_versions.py
+++ b/scripts/fetch_nightly_versions.py
@@ -68,6 +68,11 @@ def get_latest_commit(
         "--extra-path",
         help="path to a yaml file with spack packages",
     )
+    parser.add_argument(
+        "--only-merge",
+        help="only merge the packages.yaml files",
+        action="store_true",
+    )
     # parser.add_argument(
     #     "--spack",
     #     help="path to the spack.yaml in the nightly environment",
@@ -164,6 +169,8 @@ def get_latest_commit(
         ("raida", "ilcsoft/raida"),
         ("sio", "ilcsoft/sio"),
     ]:
+        if args.only_merge:
+            break
         gitlab = False
         if package == "opendatadetector":
             gitlab = "https://gitlab.cern.ch/api/v4/projects/%s/repository/commits"