diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d391a9f..22672df8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -550,7 +550,7 @@ user_spack_environment:
     - spack concretize
     - spack install --only dependencies edm4eic
     - spack install --verbose
-    - ls -al $HOME/spack/linux-*/compiler-wrapper-1.0-*/libexec/spack/gcc/g++
+    - ls -al $HOME/spack/linux-*/compiler-wrapper-*/libexec/spack/gcc/g++
     - ls -al $HOME/spack/linux-*/edm4eic-*/include/edm4eic/EDM4eicVersion.h
     - ls $HOME/spack/
 
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index d9a05626..60b7834a 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -302,7 +302,7 @@ packages:
     - '@2.1.3'
   iwyu:
     require:
-    - '@0.23:'
+    - '@0.23:0.24'  # pinned to avoid depending on newer llvm than system
   jana2:
     require:
     - '@2026.02.00'
@@ -507,6 +507,9 @@ packages:
   py-lmfit:
     require:
     - '@1.0.2:'
+  py-matplotlib:
+    require:
+    - '@3.10'  # avoid FT_Render_Glyph errors possibly due to https://github.com/matplotlib/matplotlib/pull/30059
   py-mplhep:
     require:
     - '@0.4.0:'
@@ -571,9 +574,12 @@ packages:
   py-seaborn:
     require:
     - '@0.13.2:'
+  py-setuptools:
+    require:
+    - '@80:'
   py-tensorflow:
     require:
-    - '@2.20'
+    - '@2.21'
   py-toml:
     require:
     - '@0.10.2:'
@@ -604,6 +610,9 @@ packages:
     require:
     - '@6.7.2:'
     - +opengl
+  rdma-core:
+    require:
+    - ~pyverbs  # avoid constraint in https://github.com/spack/spack-packages/pull/2791
   rivet:
     require:
     - '@4.1.0:'
diff --git a/spack-packages.sh b/spack-packages.sh
index f3d0cf64..09cf311c 100644
--- a/spack-packages.sh
+++ b/spack-packages.sh
@@ -7,37 +7,22 @@ SPACKPACKAGES_ORGREPO="spack/spack-packages"
 ## Note: nightly builds will use e.g. develop
 ## Note: when changing this, also make new buildcache public
 ## (default is only visible with internal authentication)
-SPACKPACKAGES_VERSION="v2026.03.0"
+SPACKPACKAGES_VERSION="v2026.06.0"
 
 ## Space-separated list of spack-packages cherry-picks
 read -r -d '' SPACKPACKAGES_CHERRYPICKS <<- \
 --- || true
 a115a811bdfce4db5298a9ba9b7903ccfb0de101
 20444b8e9382e659360a1446688d10a8c2d2ad31
-5c37f836753e8f9683fdc547f3661c5045abcbd1
 f5742718da7bd1d078ddc8423011a82ef2e3c759
-0d4e42deee0f561013568d1e92205a084cf203bc
-6346a54e35ee6281b8e8c6a1bc9c102893593c8e
-f0ff58aff997ab3c4c0598e0ccdfd662a06d1233
-bd32638d817fa66188880e557196acd2a5d6e7b6
-b17f3abec760256ad7faf1b1d102f2553d6a3622
-45f50975f023b3a444217e3d474c2b2d264763b3
-6b86b44735775c97636861dd66ee14ce83906422
-7f9f7ff5c232068aec8ff30b147a098dd25d9ef9
-346babf5aebcf03045fbe10e59750fac8c95947f
-2c49a2c6a2f8a95c25e0add0e8fc67d1a5351f96
-107eb9966c8a9688e042c42e903274099688b590
-cfdc775b857dbecc1b7ba62b5ec00d4f8b0f3e6b
-045873c8cbce3eef07ed068a998467e01bd91129
-b11529d6bbd8abc9f7bde6faf290b1c22385a022
-9d1b52d36a4c89d9c3964f599cd00232b901e9ac
 deb4f17d93dbe012403614245334f7c73fcc086f
-0d64b2bab72a99441f042b663e4bc993ec0db45d
-a77a7ed0d2630466cac71165026387b1381b058a
-403e4e0b2189600a736106bcfee568e31b5bcb22
-88800eeac4ee97b7689b0a84d066e4f634f32b46
-d8271eec35998674d3c67c7613b010fa98519df3
-86e2acd247221d45f9944ac2f69518b8766baec3
+82a6d07a37d13c247e84417055f9cb5b4802ac4f
+47780b2c59a8356c1f13cd7c8d250e3250c15ba8
+28bd1a044251fca35e14ba55d7ddb567deadcdaa
+a7c32f24cd5b69b237dc974804a71326306f4e58
+de97f131df3dbc940151f406afd5c2c1158a660c
+caf013be0ee1594fdbba8feb07ffecc88474a2b0
+75395349957ad785cca50002dffb18bbcb48af27
 ---
 ## Optional hash table with comma-separated file list
 ## For these commits, the cherry-pick will be restricted to the listed files only.
@@ -49,27 +34,12 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \
 ## [hash]: [description]
 ## a115a811bdfce4db5298a9ba9b7903ccfb0de101: github-copilot: new package
 ## 20444b8e9382e659360a1446688d10a8c2d2ad31: github-copilot: add v1.0.8
-## 5c37f836753e8f9683fdc547f3661c5045abcbd1: root: require openblas ~ilp64 symbol_suffix=none when ^openblas
 ## f5742718da7bd1d078ddc8423011a82ef2e3c759: gaudi: workaround test-dependency bug with a when
-## 0d4e42deee0f561013568d1e92205a084cf203bc: g4hepem: new package
-## 6346a54e35ee6281b8e8c6a1bc9c102893593c8e: g4adept: new package
-## f0ff58aff997ab3c4c0598e0ccdfd662a06d1233: py-tf2onnx: add v1.17.0 (new package)
-## bd32638d817fa66188880e557196acd2a5d6e7b6: py-tf2onnx: depends on py-tensorflow
-## b17f3abec760256ad7faf1b1d102f2553d6a3622: (py-)protobuf: add v(5.)28.3
-## 45f50975f023b3a444217e3d474c2b2d264763b3: py-torch: patch for GCC-14.2 ICE on aarch64
-## 6b86b44735775c97636861dd66ee14ce83906422: apfelxx, epic, partons*, sfml: new packages
-## 7f9f7ff5c232068aec8ff30b147a098dd25d9ef9: pelican: new package, v7.24.3
-## 346babf5aebcf03045fbe10e59750fac8c95947f: py-mplhep(-data): add new versions
-## 2c49a2c6a2f8a95c25e0add0e8fc67d1a5351f96: py-awkward, py-uproot, py-uhi ecosystem (HEP): add new versions
-## 107eb9966c8a9688e042c42e903274099688b590: dd4hep: add v1.36
-## cfdc775b857dbecc1b7ba62b5ec00d4f8b0f3e6b: dd4hep: add v1.37
-## 045873c8cbce3eef07ed068a998467e01bd91129: py-snakemake-storage-plugin-pelican: new package v0.1.1 + deps
-## b11529d6bbd8abc9f7bde6faf290b1c22385a022: py-onnxruntime: only run tests when self.run_tests
-## 9d1b52d36a4c89d9c3964f599cd00232b901e9ac: julia: avoid cascading mbedtls in v1.12+
 ## deb4f17d93dbe012403614245334f7c73fcc086f: fix: add latest osg-ca-cert
-## 0d64b2bab72a99441f042b663e4bc993ec0db45d: osg-ca-certs: depends on gmake and perl, type build
-## a77a7ed0d2630466cac71165026387b1381b058a: py-pynacl: depends on gmake, type build
-## 403e4e0b2189600a736106bcfee568e31b5bcb22: py-rucio-clients: add 40.2.0
-## 88800eeac4ee97b7689b0a84d066e4f634f32b46: py-boto3: add v1.42.85 and py-botocore: add v1.42.85
-## d8271eec35998674d3c67c7613b010fa98519df3: py-setuptools-scm: Earlier versions require setuptools-scm too
-## 86e2acd247221d45f9944ac2f69518b8766baec3: py-boto3: add v1.43.17, updated dependencies
+## 82a6d07a37d13c247e84417055f9cb5b4802ac4f: osg-ca-certs: depends on gmake and perl, type build
+## 47780b2c59a8356c1f13cd7c8d250e3250c15ba8: py-pynacl: depends on gmake, type build
+## 28bd1a044251fca35e14ba55d7ddb567deadcdaa: py-throttler: add v1.2.3
+## a7c32f24cd5b69b237dc974804a71326306f4e58: py-tensorboard: add v2.21.0
+## de97f131df3dbc940151f406afd5c2c1158a660c: TensorFlow: add v2.21.0
+## caf013be0ee1594fdbba8feb07ffecc88474a2b0: Add missing xxd dep
+## 75395349957ad785cca50002dffb18bbcb48af27: py-torch: ensure setuptools is not unnecessarily constrained for 2.10: