containers/jug/dev.Dockerfile

@@ -72,16 +72,6 @@ make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
   SPACK_ENV=${SPACK_ENV} \
   BUILDCACHE_OCI_PROMPT="eicweb" \
   BUILDCACHE_OCI_FINAL="ghcr"
-spack gc --yes-to-all
-spack find --long --no-groups \
-| sed -e '1,/Installed packages/d;s/\([^@]*\).*/\1/g' \
-| uniq -D -f1 | grep -v -w -e "\(epic\|py-pip\|py-cython\)" \
-| tee /tmp/duplicates.txt
-if [ -s /tmp/duplicates.txt ] ; then
-  echo "Duplicate packages found"
-  cat /tmp/duplicates.txt | while read hash spec ; do spack spec --long /${hash} ; done
-  exit 1
-fi
 ccache --show-stats
 ccache --zero-stats
 EOF

spack-environment/packages.yaml

@@ -269,7 +269,7 @@ packages:
     - +fastjet +root
   python:
     require:
-    - '@3.10.13'
+    - '@3.11.7'
   py-awkward:
     require:
     - '@2.1.1'

spack.sh

@@ -28,10 +28,18 @@ d3bf1e04fca844abb7c1eeac38dda4e126c81b67
 737b70cbbfacb3fba8054426e9b5bf8ede6d8faf
 a66586d749197841bd74e289802126f2359287a8
 7503a417731910d918a7863d1862f62c9b76429d
+f8f01c336c882f29ac364995423b9f69ac365462
+6051d56014730528da8dfa69934d93f9b7941a70
+67536058077995cab1ed23b8ca62aaf75463ae04
+7b9f8abce5cee74546a6f588f88c6f353170d52b
+096ab11961995ac8d69f7b177cbcadf618d3068e
+6c4abef75cb2b98c337f8a3179797e29dfdc9ca3
 ---
 ## Optional hash table with comma-separated file list
 read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
 --- || true
+[67536058077995cab1ed23b8ca62aaf75463ae04]=var/spack/repos/builtin/packages/py-protobuf/package.py
+[7b9f8abce5cee74546a6f588f88c6f353170d52b]=var/spack/repos/builtin/packages/protobuf/package.py,var/spack/repos/builtin/packages/py-protobuf/package.py
 ---
 ## Ref: https://github.com/spack/spack/commit/[hash]
 ## [hash]: [description]
@@ -55,3 +63,9 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
 ## 737b70cbbfacb3fba8054426e9b5bf8ede6d8faf: Buildcache: remove deprecated --allow-root and preview subcommand
 ## a66586d749197841bd74e289802126f2359287a8: spack buildcache push: best effort
 ## 7503a417731910d918a7863d1862f62c9b76429d: cuda: add v12.4.1
+## f8f01c336c882f29ac364995423b9f69ac365462: clang: support cxx20_flag and cxx23_flag
+## 6051d56014730528da8dfa69934d93f9b7941a70: fastjet: avoid plugins=all,cxx combinations
+## 67536058077995cab1ed23b8ca62aaf75463ae04: Update py-pyspark and py-py4j (py-protobuf only)
+## 7b9f8abce5cee74546a6f588f88c6f353170d52b: Add depends_on([c,cxx,fortran])
+## 096ab11961995ac8d69f7b177cbcadf618d3068e: py-onnx: link to external protobuf
+## 6c4abef75cb2b98c337f8a3179797e29dfdc9ca3: py-protobuf: drop +cpp, always require protobuf