Changes for the new nightly builds from scratch

.cherry-pick

@@ -0,0 +1,55 @@
+git remote add jmcarcell https://github.com/jmcarcell/spack || true
+git fetch jmcarcell -q
+
+# add a recent version of madgraph, remove when https://github.com/spack/spack/pull/41128 is merged
+curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/41128.diff | patch -p1
+
+# add vdt for CPATH, needed for podio+rntuple
+git cherry-pick f97fabc3ff12527e5220ea6917719a73f8bd4315 -X theirs --no-commit
+
+# Add a patch to fix whizard (re pythia8), remove!
+curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43045.diff | patch -p1
+
+# podio: add rpath, remove when https://github.com/spack/spack/pull/42844 is merged
+git cherry-pick 4d3b81d73b9dcbbe176d6baf3c00a4032307f6a8 -X theirs --no-commit
+
+# gaudi: add missing std::list, remove when building 38.2
+git cherry-pick 6b02e009664c6effb581023982dcb7863da5fb88 -X theirs --no-commit
+
+# gaudi: Add v38.1, remove!
+git cherry-pick 64df3df040c71ce2f31f718df1afb373bcf68368 -X theirs --no-commit
+
+# pythia8: Add fix for 8.311, remove when https://github.com/spack/spack/pull/43803 is merged
+curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43803.diff | patch -p1
+
+# fastjet: Add a cxxstd variant, remove!
+curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44072.diff | patch -p1
+
+# pythia8: Add a cxxstd, remove when https://github.com/spack/spack/pull/44077 is merged
+curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44077.diff | patch -p1
+
+# fix issues when reconcretizing a GitVersion? remove when https://github.com/spack/spack/pull/43859 is merged
+curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43859.diff | patch -p1
+
+# py-onnxruntime: Install the session headers, needed by FCCAnalyses
+git cherry-pick e272ffa5a4768d23f1579403f9872360630e7278 -X theirs --no-commit
+
+
+if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="centos"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="7"' ]]; then
+
+  # patch for intel-tbb for CentOS 7, see https://github.com/oneapi-src/oneTBB/issues/859
+  # because we use binutils from the system which is old
+  git cherry-pick d8a0b0426a1c97c33c4b8f133d38e7dc03816a8c -X theirs --no-commit
+
+  # Make py-onnxruntime depend on git for CentOS 7 because the
+  # system git is too old and fails at fetching, remove when https://github.com/spack/spack/pull/43076 is merged
+  git cherry-pick b330252d082dc2865fa169af831b7b7c2affa8a5 -X theirs --no-commit
+
+fi
+
+if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID=ubuntu' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="22.04"' ]]; then
+
+  # patch to rename libz so texlive can be built
+  git cherry-pick f8c6f240ba9b99218eb72bfadce9f99952fec1de -X theirs --no-commit
+
+fi

.latest-commit

@@ -1 +1 @@
-12963c894f59bf03f2f8ab94536019d9f82d3527
+f5946c4621035dd466953c8d2664ff5f82f38138

environments/key4hep-common/compilers.yaml

@@ -26,7 +26,7 @@ compilers:
     environment: {}
     extra_rpaths: []
 - compiler:
-    spec: gcc@11.3.1
+    spec: gcc@11.4.1
     paths:
       cc: /usr/bin/gcc
       cxx: /usr/bin/g++

environments/key4hep-common/packages.yaml

@@ -1,4 +1,10 @@
 packages:
+  all:
+    target: [x86_64]
+    variants: build_type=Release cxxstd=20
+    buildable: true
+    compiler: []
+
   acts:
     require: +dd4hep cxxstd=20 +json
   boost:
@@ -24,6 +30,8 @@ packages:
     variants: ~flang~lldb~lld~lua~mlir~internal_unwind~polly~libomptarget~libomptarget_debug~gold~split_dwarf~llvm_dylib~link_llvm_dylib~omp_tsan~omp_as_runtime~code_signing~python~version_suffix~shlib_symbol_version~z3~zstd compiler-rt="none" libcxx="none" targets="x86"
   marlin:
     require: +lccd
+  madgraph5amc:
+    require: '@3: +pythia8'
   podio:
     require: +rntuple+rpath+sio
   py-numpy:
@@ -76,13 +84,12 @@ packages:
     - spec: openssh@99
       prefix: /usr
 
-
   root:
-    require: +davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=20
+    require: '@6.30: +davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=20'
   py-tensorflow:
     require: ~cuda~nccl
   whizard:
-    require: ~fastjet~latex+lcio~lhapdf+openloops~openmp+pythia8 hepmc=3
+    require: ~fastjet~latex+lcio~lhapdf+openloops+openmp+pythia8 hepmc=3
   k4simdelphes:
     require: ~delphes_hepmc
   evtgen:
@@ -93,113 +100,29 @@ packages:
     require: ~openmp
   gperftools:
     require: ~libunwind
-  all:
-    target: [x86_64]
-    variants: build_type=Release cxxstd=20
-    buildable: true
-    compiler: []
 
-
-  # C++20
-  aidatt:
-    variants: build_type=Release cxxstd=20
-  ced:
-    variants: build_type=Release cxxstd=20
-  cedviewer:
-    variants: build_type=Release cxxstd=20
-  cepcsw:
-    variants: build_type=Release cxxstd=20
-  clicperformance:
-    variants: build_type=Release
-  conformaltracking:
-    variants: build_type=Release
-  ddfastshowerml:
-    variants: build_type=Release
-  ddkaltest:
-    variants: build_type=Release
-  ddmarlinpandora:
-    variants: build_type=Release cxxstd=20
-  delphes:
-    variants: build_type=Release cxxstd=20
-  dual-readout:
-    variants: build_type=Release cxxstd=20
+  # C++20 that don't appear above
   edm4hep:
-    variants: build_type=Release cxxstd=20
-  fcalclusterer:
-    variants: build_type=Release cxxstd=20
-  fccanalyses:
-    variants: build_type=Release cxxstd=20
-  fccdetectors:
-    variants: build_type=Release cxxstd=20
-  fccsw:
-    variants: build_type=Release cxxstd=20
-  forwardtracking:
-    variants: build_type=Release cxxstd=20
+    variants: cxxstd=20
+  fastjet:
+    variants: cxxstd=20
   gear:
-    variants: build_type=Release cxxstd=20
+    variants: cxxstd=20
   ilcutil:
-    variants: build_type=Release cxxstd=20
-  ildperformance:
-    variants: build_type=Release cxxstd=20
-  k4clue:
-    variants: build_type=Release cxxstd=20
-  k4edm4hep2lcioconv:
-    variants: build_type=Release cxxstd=20
-  k4fwcore:
-    variants: build_type=Release cxxstd=20
-  k4gen:
-    variants: build_type=Release cxxstd=20
-  k4geo:
-    variants: build_type=Release cxxstd=20
-  k4marlinwrapper:
-    variants: build_type=Release cxxstd=20
-  k4projecttemplate:
-    variants: build_type=Release cxxstd=20
-  k4reccalorimeter:
-    variants: build_type=Release cxxstd=20
-  k4reco:
-    variants: build_type=Release cxxstd=20
-  k4rectracker:
-    variants: build_type=Release cxxstd=20
-  k4simgeant4:
-    variants: build_type=Release cxxstd=20
-  kaltest:
-    variants: build_type=Release cxxstd=20
-  kitrack:
-    variants: build_type=Release cxxstd=20
-  kitrackmarlin:
-    variants: build_type=Release cxxstd=20
-  lcfiplus:
-    variants: build_type=Release cxxstd=20
+    variants: cxxstd=20
   lcio:
-    variants: build_type=Release cxxstd=20
-  lctuple:
-    variants: build_type=Release cxxstd=20
-  marlindd4hep:
-    variants: build_type=Release cxxstd=20
-  marlinfastjet:
-    variants: build_type=Release cxxstd=20
-  marlinkinfit:
-    variants: build_type=Release cxxstd=20
-  marlinkinfitprocessors:
-    variants: build_type=Release cxxstd=20
-  marlinreco:
-    variants: build_type=Release cxxstd=20
-  marlintrk:
-    variants: build_type=Release
-  marlintrkprocessors:
-    variants: build_type=Release cxxstd=20
-  marlinutil:
-    variants: build_type=Release cxxstd=20
-  opendatadetector:
-    variants: build_type=Release cxxstd=20
-  overlay:
-    variants: build_type=Release cxxstd=20
-  pandoraanalysis:
-    variants: build_type=Release cxxstd=20
-  physsim:
-    variants: build_type=Release
-  raida:
-    variants: build_type=Release
+    variants: cxxstd=20
+  pythia8:
+    variants: cxxstd=20
   sio:
-    variants: build_type=Release cxxstd=20
+    variants: cxxstd=20
+
+  # onnx and py-onnx should have the same versions
+  # And all should be consistent based on this table:
+  # https://onnxruntime.ai/docs/reference/compatibility.html#onnx-opset-support
+  onnx:
+    require: '@1.15.0'
+  py-onnx:
+    require: '@1.15.0'
+  py-onnxruntime:
+    require: '@1.17.1'