Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • containers/eic_container
  • wdconinc/eic_container
  • tooba/eic_container
3 results
Show changes
Commits on Source (3)
......@@ -3,4 +3,4 @@ EICSPACK_ORGREPO="eic/eic-spack"
## EIC spack commit hash or github version, e.g. v0.19.7
## note: nightly builds could use a branch e.g. releases/v0.19
EICSPACK_VERSION="bd66c9c7ff9f720567f12f13b49233198efa5132"
EICSPACK_VERSION="c8dae5e15d61a3a7b8c87a1a4c7c8ca2893755db"
......@@ -77,7 +77,7 @@ packages:
- '@1_54a'
dd4hep:
require:
- '@1.29'
- '@1.30'
- +ddg4 +ddcad +hepmc3 +utilityapps +xercesc
- any_of: [+ddeve, -ddeve]
dpmjet:
......@@ -153,6 +153,9 @@ packages:
gettext:
require:
- +libxml2
gfal2:
require:
- +file +xrootd
gl:
require:
- glx
......@@ -184,7 +187,7 @@ packages:
- '@0.20'
jana2:
require:
- '@2.3.1'
- '@2.3.2'
- -ipo +podio +root +zmq
juggler:
require:
......
......@@ -38,6 +38,7 @@ spack:
- gaudi
- gdb
- geant4 +opengl
- gfal2
- graphviz
- hepmc3
- heppdt
......
......@@ -34,6 +34,11 @@ f8f01c336c882f29ac364995423b9f69ac365462
7b9f8abce5cee74546a6f588f88c6f353170d52b
096ab11961995ac8d69f7b177cbcadf618d3068e
6c4abef75cb2b98c337f8a3179797e29dfdc9ca3
9cdb2a8dbb742169fefe0214ee76530e7f14dfdf
04f0af0a28e1f6ff0ef0b50e28ecf9d19fe544e6
395491815acb20e48050b77dca457aa7cc340ca1
43d1cdb0bd4780bff369dafa681a8a7939313784
5bc105c01c0e458924df40d51f7111ba507689f9
---
## Optional hash table with comma-separated file list
read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
......@@ -69,3 +74,8 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
## 7b9f8abce5cee74546a6f588f88c6f353170d52b: Add depends_on([c,cxx,fortran])
## 096ab11961995ac8d69f7b177cbcadf618d3068e: py-onnx: link to external protobuf
## 6c4abef75cb2b98c337f8a3179797e29dfdc9ca3: py-protobuf: drop +cpp, always require protobuf
## 9cdb2a8dbb742169fefe0214ee76530e7f14dfdf: dd4hep: depends_on root +root7 in some cases
## 04f0af0a28e1f6ff0ef0b50e28ecf9d19fe544e6: acts,dd4hep: restrict to podio@0 to prevent failures with podio@1
## 395491815acb20e48050b77dca457aa7cc340ca1: dd4hep: mark conflict with root@6.31.1:
## 43d1cdb0bd4780bff369dafa681a8a7939313784: dd4hep: Add tag for version 1.30
## 5bc105c01c0e458924df40d51f7111ba507689f9: gfal2: new package (and dependencies)