From 9ac6761debd74fbf006af4cc1745bca939fca6a3 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Wed, 9 Aug 2023 00:50:45 +0000
Subject: [PATCH] feat: jug_prod headless
---
eic-spack.sh | 2 +-
spack-environment/packages.yaml | 11 +++++++----
spack-environment/prod/spack.yaml | 6 +++---
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/eic-spack.sh b/eic-spack.sh
index f705018e1..f876ebc82 100644
--- a/eic-spack.sh
+++ b/eic-spack.sh
@@ -3,7 +3,7 @@ EICSPACK_ORGREPO="eic/eic-spack"
## EIC spack github version, e.g. v0.19.7 or commit hash
## note: nightly builds will use e.g. releases/v0.19
-EICSPACK_VERSION="v0.20.10"
+EICSPACK_VERSION="v0.20.11"
## Space-separated list of eic-spack cherry-picks
read -r -d '' EICSPACK_CHERRYPICKS <<- \
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index 1908d2e39..2c79c7fe2 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -111,7 +111,8 @@ packages:
geant4:
require:
- '@11.1.1'
- - cxxstd=17 +opengl -vecgeom +x11 +qt +threads -vtk
+ - cxxstd=17 -vecgeom +threads -vtk
+ - any_of: [+opengl +qt +x11, -opengl -qt -x11]
graphviz:
require:
- '@8.0.1'
@@ -154,8 +155,9 @@ packages:
- '@3.11.2'
npsim:
require:
- - '@1.1.0'
- - +geocad +http
+ - '@1.2.0'
+ - +http
+ - any_of: [+geocad, -geocad]
onnx:
require:
- '@1.13.1'
@@ -265,7 +267,8 @@ packages:
root:
require:
- '@6.26.10'
- - cxxstd=17 +fftw +fortran +gdml +http -ipo +mlp +pythia8 +root7 +tmva +vc -webgui +xrootd +ssl
+ - cxxstd=17 +fftw +fortran +gdml +http -ipo +mlp +pythia8 +root7 +tmva +vc -webgui +xrootd +ssl
+ - any_of: [+opengl +x, -opengl -x]
spdlog:
require:
- '@1.11.0'
diff --git a/spack-environment/prod/spack.yaml b/spack-environment/prod/spack.yaml
index 241352aa4..5e24e5615 100644
--- a/spack-environment/prod/spack.yaml
+++ b/spack-environment/prod/spack.yaml
@@ -10,16 +10,16 @@ spack:
- fastjet
- fjcontrib
- gaudi
- - geant4
+ - geant4 -opengl
- hepmc3
- intel-tbb
- irt
- jana2
- - npsim
+ - npsim -geocad
- py-boto3
- py-jinja2
- py-jinja2-cli
- py-pip
- - root
+ - root -opengl
- xrootd
view: false
--
GitLab