Skip to content
Snippets Groups Projects
Commit 92a27bbf authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

madx 5.08.01 cherry-pick and use

parent 94a38a1c
Branches
Tags
1 merge request!272Resolve "Track madx upstreaming and cherry-pick when ready"
This commit is part of merge request !272. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 2
− 1
View file @ 92a27bbf
...@@ -11,13 +11,14 @@ variables: ...@@ -11,13 +11,14 @@ variables:
## Spack github version ## Spack github version
SPACK_VERSION: "e974b44e8673ded449ce4a3ed5844398b68e81a2" SPACK_VERSION: "e974b44e8673ded449ce4a3ed5844398b68e81a2"
## Space-separated list of spack cherry-picks ## Space-separated list of spack cherry-picks
SPACK_CHERRYPICKS: "0ab5828d0dfe2182ad108b7e7c56772303065f6e a294acfb73839c9782aff976953a969fb44e161e f181b6fef6da3b576b267799d9c47fa5c8ade67a 5f10562ad13c803bf5d22552a9f07c8c379fdd23 4c0f5f85c0dc27903280ba64d129c2e3d128573d" SPACK_CHERRYPICKS: "0ab5828d0dfe2182ad108b7e7c56772303065f6e a294acfb73839c9782aff976953a969fb44e161e f181b6fef6da3b576b267799d9c47fa5c8ade67a 5f10562ad13c803bf5d22552a9f07c8c379fdd23 4c0f5f85c0dc27903280ba64d129c2e3d128573d 6610c50414cdb451c2073a28ffc4bc3c5fd7b721"
## Ref: https://github.com/spack/spack/commit/[hash] ## Ref: https://github.com/spack/spack/commit/[hash]
## 0ab5828d0dfe2182ad108b7e7c56772303065f6e: gdk-pixbuf: Fix 2.42.2 and add 2.42.6 ## 0ab5828d0dfe2182ad108b7e7c56772303065f6e: gdk-pixbuf: Fix 2.42.2 and add 2.42.6
## a294acfb73839c9782aff976953a969fb44e161e: pythia8: bugfix for pythia8 +fastjet ## a294acfb73839c9782aff976953a969fb44e161e: pythia8: bugfix for pythia8 +fastjet
## f181b6fef6da3b576b267799d9c47fa5c8ade67a: root: depends_on fcgi and re-enabled +http support ## f181b6fef6da3b576b267799d9c47fa5c8ade67a: root: depends_on fcgi and re-enabled +http support
## 5f10562ad13c803bf5d22552a9f07c8c379fdd23: [geant4] new version geant4@10.7.3 ## 5f10562ad13c803bf5d22552a9f07c8c379fdd23: [geant4] new version geant4@10.7.3
## 4c0f5f85c0dc27903280ba64d129c2e3d128573d: EDM4hep version 0.4 ## 4c0f5f85c0dc27903280ba64d129c2e3d128573d: EDM4hep version 0.4
## 6610c50414cdb451c2073a28ffc4bc3c5fd7b721: madx: new package, versions 5.07.00, 5.08.00, 5.08.01
## We need to enable Docker Buildkit to use cache mounts and better ## We need to enable Docker Buildkit to use cache mounts and better
## build performance overal ## build performance overal
......
spack.yaml
+ 1
− 1
View file @ 92a27bbf
...@@ -20,7 +20,7 @@ spack: ...@@ -20,7 +20,7 @@ spack:
- heppdt@3.04.01 - heppdt@3.04.01
- igprof@5.9.16 - igprof@5.9.16
- imagemagick@7.0.8-7 - imagemagick@7.0.8-7
- madx@5.07.00 - madx@5.08.01
- mesa@21.2.3 swr=none +glx -llvm +opengl +opengles +osmesa - mesa@21.2.3 swr=none +glx -llvm +opengl +opengles +osmesa
- mesa-demos - mesa-demos
- nlohmann-json@3.10.4 - nlohmann-json@3.10.4
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment