From a754341f6c7590565066891590c9d79e5c6246a9 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 28 Jan 2025 05:38:58 -0600
Subject: [PATCH] hep stack: additional event generator packages (#48565)

* hep stack: additional event generator packages

* hep: adidtional packages

* hep: collier doesn't have +pic +shared

* py-awkward-cpp: fix scikit-build-core range of applicability

* hep: disable agile

* hep: disable garfieldpp and genie

* py-wxpython: depends_on pkgconfig even if using external wxwidgets

* hep: disable professor
---
 .../cloud_pipelines/stacks/hep/spack.yaml     | 24 +++++++++++++++++--
 .../packages/py-awkward-cpp/package.py        |  2 +-
 .../builtin/packages/py-wxpython/package.py   |  2 ++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml
index b235b70493e..cb01d041a08 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml
@@ -31,26 +31,43 @@ spack:
   specs:
   # CPU
   - acts +analysis +dd4hep +edm4hep +examples +fatras +geant4 +hepmc3 +podio +pythia8 +python +tgeo cxxstd=20
+  #- agile  # fails on c++>11 compiler
+  - alpgen
+  - ampt
+  - apfel +lhapdf +python
   - celeritas +geant4 +hepmc3 +openmp +root +shared +vecgeom cxxstd=20
+  - cepgen
+  - cernlib +shared
+  - collier
   - dd4hep +ddalign +ddcad +ddcond +dddetectors +dddigi +ddeve +ddg4 +ddrec +edm4hep +hepmc3 +lcio +utilityapps +xercesc
   - delphes +pythia8
   - dpmjet
   - edm4hep
-  - fastjet
+  - evtgen +hepmc3 +photos +pythia8 +sherpa +tauola
+  - fastjet plugins=all
+  - feynhiggs
   - fjcontrib
+  #- garfieldpp
   - gaudi +aida +examples +heppdt +xercesc ^gdb +debuginfod +python
   - geant4 +opengl +qt +threads ~vtk ^[virtuals=qmake] qt
+  #- genie +atmo
   - hepmc
   - hepmc3 +interfaces +protobuf +python +rootio
   #- herwig3 +njet +vbfnlo  # Note: herwig3 fails to find evtgen
+  - hztool
   - lcio -examples ~jar +rootdict  # Note: lcio +examples ^ncurses -termlib, which leads to conflicts
   - lhapdf +python
+  - lhapdfsets sets=default
   - madgraph5amc
+  - njet
   - opendatadetector
+  - openloops
   - pandoramonitoring
   - pandorapfa
   - pandorasdk
+  - photos +hepmc3
   - podio +rntuple +sio
+  #- professor
   - py-awkward
   - py-boost-histogram
   - py-hepunits
@@ -67,9 +84,12 @@ spack:
   - rivet hepmc=3
   - root +davix +dcache +examples +fftw +fits +fortran +gdml +graphviz +gsl +http +math +minuit +mlp +mysql +opengl +postgres +pythia8 +python +r +roofit +root7 +rpath ~shadow +spectrum +sqlite +ssl +tbb +threads +tmva +unuran +vc +vdt +veccore +webgui +x +xml +xrootd
   - sherpa +analysis ~blackhat +gzip +hepmc3 +hepmc3root +lhapdf +lhole +openloops +pythia ~python ~recola ~rivet +root +ufo
-  - thepeg ~rivet
+  - tauola +hepmc3 +lhapdf cxxstd=20
+  - thepeg hepmc=3 ~rivet
   - vecgeom +gdml +geant4 +root
+  - whizard +fastjet +gosam hepmc=3 +lcio +lhapdf +openloops +openmp +pythia8
   - xrootd +davix +http +krb5 +python +readline +scitokens-cpp
+  - yoda +root
 
   ci:
     pipeline-gen:
diff --git a/var/spack/repos/builtin/packages/py-awkward-cpp/package.py b/var/spack/repos/builtin/packages/py-awkward-cpp/package.py
index 31cca8a0c9a..bccc6827a39 100644
--- a/var/spack/repos/builtin/packages/py-awkward-cpp/package.py
+++ b/var/spack/repos/builtin/packages/py-awkward-cpp/package.py
@@ -34,7 +34,7 @@ class PyAwkwardCpp(PythonPackage):
 
     depends_on("python@3.7:", type=("build", "run"))
     depends_on("python@3.8:", type=("build", "run"), when="@19:")
-    depends_on("py-scikit-build-core@0.2.0:+pyproject", when="@11:", type="build")
+    depends_on("py-scikit-build-core@0.2.0:+pyproject", when="@10:", type="build")
     depends_on("py-pybind11", type=("build", "link"))
     depends_on("py-numpy@1.17.0:", when="@12:", type=("build", "run"))
     depends_on("py-numpy@1.18.0:", when="@19:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-wxpython/package.py b/var/spack/repos/builtin/packages/py-wxpython/package.py
index 8b61d551465..fe9c44db3bb 100644
--- a/var/spack/repos/builtin/packages/py-wxpython/package.py
+++ b/var/spack/repos/builtin/packages/py-wxpython/package.py
@@ -21,6 +21,8 @@ class PyWxpython(PythonPackage):
     depends_on("wxwidgets +gui")
     depends_on("wxwidgets@3.2.6 +gui", when="@4.2.2")
 
+    # Needed by the buildtools/config.py script
+    depends_on("pkgconfig", type="build")
     # Needed for the build.py script
     depends_on("py-setuptools", type="build")
     depends_on("py-setuptools@:75", type="build", when="@:4.1")  # deprecated license-file