diff --git a/eic-spack.sh b/eic-spack.sh index 412e9485..0bae9979 100644 --- a/eic-spack.sh +++ b/eic-spack.sh @@ -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="2ac6537435128a2dae054ab14a0bbf23f4fb0fb1" +EICSPACK_VERSION="f4236f3c2edd6bfc8e0d6dfcdf3e0d0ac6dc5b0b" diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 5db76af9..97761101 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -223,11 +223,11 @@ packages: - '@0.23' jana2: require: - - '@2.4.2' + - '@2.4.3' - -ipo +podio +root +zmq juggler: require: - - '@15.0.2' # JUGGLER_VERSION + - '@15.0.3' # JUGGLER_VERSION - cxxstd=20 julia: require: @@ -316,7 +316,7 @@ packages: - '@1.0.0' podio: require: - - '@1.3' + - '@1.6' - cxxstd=20 - +rntuple package_attributes: diff --git a/spack-packages.sh b/spack-packages.sh index 78622020..4bc4c538 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -46,12 +46,20 @@ c4d983b764d7b1ee2b63da79f5f25365ac61ce7a 5c37f836753e8f9683fdc547f3661c5045abcbd1 c75e10845431600b163c597545bd099e427c62f5 438a7d95de1b81e15107edbf341b20824ec80635 +c71f8e48245012565ac7b0648dfda137b0071de7 +4ef82e75f5cae7b4d093e41043e26b259498264e +8d027b1651840631350d0ba9f30624f2baf26350 +566e1b070e17ffe8c2d0bf4122568af8a81db1cd +048bffaea064919ccfc2f740e14bbb987e7f5c7e +6b57d7a93de84dd5492b9308a9612924ab641dce +ba94c07db577eaf5eb4b0450721fbc7e98879922 --- ## Optional hash table with comma-separated file list read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ --- || true [b063312bb52fb62010e04588f6b16d37e16c8d02]=repos/spack_repo/builtin/packages/py_tensorflow/package.py [7fad8a78d35b5556e1d7aa92a71a4e1c58a1665a]=repos/spack_repo/builtin/packages/py_tensorflow/package.py,repos/spack_repo/builtin/packages/py_tensorboard/package.py +[4ef82e75f5cae7b4d093e41043e26b259498264e]=repos/spack_repo/builtin/packages/podio/package.py --- ## Ref: https://github.com/spack/spack-packages/commit/[hash] ## [hash]: [description] @@ -93,3 +101,10 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 5c37f836753e8f9683fdc547f3661c5045abcbd1: root: require openblas ~ilp64 symbol_suffix=none when ^openblas ## c75e10845431600b163c597545bd099e427c62f5: dd4hep: v1.33 ## 438a7d95de1b81e15107edbf341b20824ec80635: root: add v6.36.06 +## c71f8e48245012565ac7b0648dfda137b0071de7: podio: Add latest tag 1.4 and 1.4.1 +## 4ef82e75f5cae7b4d093e41043e26b259498264e: Deprecation removals: P +## 8d027b1651840631350d0ba9f30624f2baf26350: podio: Add version 1.5 +## 566e1b070e17ffe8c2d0bf4122568af8a81db1cd: podio: add v1.6 +## 048bffaea064919ccfc2f740e14bbb987e7f5c7e: podio: Add the conditional value 23 for cxxstd +## 6b57d7a93de84dd5492b9308a9612924ab641dce: podio: ensure Python.h is found in ROOT ACLiC +## ba94c07db577eaf5eb4b0450721fbc7e98879922: podio: use headers.directories[0] to get str, not list