From 24f132578dd50fcd2493c2d0513c67ac745813dc Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 13 Jan 2022 01:27:51 +0000
Subject: [PATCH] spack.yaml: upgrade packages
---
.gitlab-ci.yml | 7 ++++++-
spack.yaml | 32 ++++++++++++++++----------------
2 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c55b41c70..6bec0f73a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,12 @@ variables:
## Spack github version
SPACK_VERSION: "e974b44e8673ded449ce4a3ed5844398b68e81a2"
## Space-separated list of spack cherry-picks
- SPACK_CHERRYPICKS: "0ab5828d0dfe2182ad108b7e7c56772303065f6e a294acfb73839c9782aff976953a969fb44e161e f181b6fef6da3b576b267799d9c47fa5c8ade67a"
+ SPACK_CHERRYPICKS: "0ab5828d0dfe2182ad108b7e7c56772303065f6e a294acfb73839c9782aff976953a969fb44e161e f181b6fef6da3b576b267799d9c47fa5c8ade67a 5f10562ad13c803bf5d22552a9f07c8c379fdd23"
+ ## Ref: https://github.com/spack/spack/commit/[hash]
+ ## 0ab5828d0dfe2182ad108b7e7c56772303065f6e: gdk-pixbuf: Fix 2.42.2 and add 2.42.6
+ ## a294acfb73839c9782aff976953a969fb44e161e: pythia8: bugfix for pythia8 +fastjet
+ ## f181b6fef6da3b576b267799d9c47fa5c8ade67a: root: depends_on fcgi and re-enabled +http support
+ ## 5f10562ad13c803bf5d22552a9f07c8c379fdd23: [geant4] new version geant4@10.7.3
## We need to enable Docker Buildkit to use cache mounts and better
## build performance overal
diff --git a/spack.yaml b/spack.yaml
index 125b31ae2..7bacbeaf6 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -3,39 +3,39 @@ spack:
- acts@14.1.0 +dd4hep +digitization +identification +json +tgeo +ipo +examples +fatras +geant4
- cairo@1.16.0 +fc+ft+X+pdf+gobject
- clhep@2.4.4.0 cxxstd=17
- - cmake@3.20.0
+ - cmake@3.21.4
- dawn@3_91a
- dawncut@1_54a
- - dd4hep@1.18 +geant4 +assimp +hepmc3 +ipo +lcio
- - eigen@3.3.9
- - emacs@27.0:27.99 toolkit=athena
+ - dd4hep@1.18 +geant4 -assimp +hepmc3 +ipo +lcio
+ - eigen@3.4.0
+ - emacs@27.2 toolkit=athena
- fastjet@3.3.3
- - fmt@7.1.2 +shared cxxstd=17
+ - fmt@8.0.1 +shared cxxstd=17
- gaudi@36.0
- - geant4@10.7.1 cxxstd=17 +opengl +vecgeom +x11 +qt +threads
+ - geant4@10.7.3 cxxstd=17 +opengl +vecgeom +x11 +qt +threads
- genfit@2.00.00
- hepmc3@3.2.4 +python +rootio
- heppdt@3.04.01
- igprof@5.9.16
- - imagemagick@7.0.0:7.0.99
- - madx@5.06.1
- - mesa swr=none +opengl -llvm +osmesa
+ - imagemagick@7.0.8-7
+ - madx@5.07.00
+ - mesa@21.2.3 swr=none +opengl -llvm +osmesa
- mesa-demos
- - nlohmann-json@3.9.1
- - opencascade@7.4.0p1
+ - nlohmann-json@3.10.4
+ - opencascade@7.5.3
- pkg-config@0.29.2
- podio@0.14 build_type=RelWithDebInfo
- pythia8@8.306 +fastjet
- - python@3.9.6
- - py-numpy@1.20.1
- - py-pip@20.2
+ - python@3.9.7
+ - py-numpy@1.21.3
+ - py-pip@21.1.2
- py-setuptools@58.2.0
- py-wheel@0.36.2
- - qt +opengl
+ - qt@5.15.2 +opengl
- root@6.24.06 cxxstd=17
+fftw +fortran +gdml +http +mlp +pythia8
+root7 +tmva +vc +xrootd +ssl
- - spdlog@1.8.1
+ - spdlog@1.9.2
- stow@2.3.1
- xrootd@5.1.0 cxxstd=17 +python
concretization: together
--
GitLab