From ee7bd74ce5449e98891cb5f6edc117b2fe588269 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 24 Mar 2026 10:13:02 -0500
Subject: [PATCH 1/2] feat: spack: views: collapse unique subtrees in symlink
 case

---
 spack.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spack.sh b/spack.sh
index 5aedca8e..456a4e4f 100644
--- a/spack.sh
+++ b/spack.sh
@@ -11,6 +11,7 @@ read -r -d '' SPACK_CHERRYPICKS <<- \
 09f75ee426a2e05e0543570821582480ff823ba5
 a462612b64e97fa7dfe461c32c58553fd6ec63c5
 292b0dcaba3b2a5e3f9668d205d39fee2c715721
+d55f9abacc4e153d43a4c8bff81a383ba2f311f5
 ---
 ## Optional hash table with comma-separated file list
 read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
@@ -21,3 +22,4 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
 ## 09f75ee426a2e05e0543570821582480ff823ba5: setup-env.sh: if exe contains qemu, use /proc/$$/comm instead
 ## a462612b64e97fa7dfe461c32c58553fd6ec63c5: fix: allow versions with git attr in packages without git attr
 ## 292b0dcaba3b2a5e3f9668d205d39fee2c715721: fix: write created time field with OCI buildcache config
+## d55f9abacc4e153d43a4c8bff81a383ba2f311f5: views: collapse unique subtrees in symlink case

From a46fea0a4520176a07a0719c7e624eef0c75d055 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Tue, 24 Mar 2026 10:45:43 -0500
Subject: [PATCH 2/2] docs: mark cherry-pick lists in spack-environment.md as
 illustrative (#211)

* Initial plan

* docs: clarify cherry-pick lists in spack-environment.md are illustrative

Co-authored-by: wdconinc <4656391+wdconinc@users.noreply.github.com>
Agent-Logs-Url: https://github.com/eic/containers/sessions/55eaa520-04c7-42a9-ac0b-07b0bf4ff6f0

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: wdconinc <4656391+wdconinc@users.noreply.github.com>
---
 docs/spack-environment.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/spack-environment.md b/docs/spack-environment.md
index 538b46b6..6de67b49 100644
--- a/docs/spack-environment.md
+++ b/docs/spack-environment.md
@@ -145,14 +145,26 @@ spack:
 
 ### Cherry-picks
 
-Spack versions can include cherry-picks from newer commits:
+Spack versions can include cherry-picks from newer commits. The commit hashes listed
+below are illustrative only — the actual cherry-picks applied may differ from what
+is shown here. Refer to `spack.sh` and `spack-packages.sh` for the current lists.
 
 ```bash
-# From spack.sh
+# From spack.sh (illustrative — see spack.sh for actual commits)
 SPACK_VERSION="v1.1.0"
 SPACK_CHERRYPICKS=$(cat <<- EOF
 09f75ee426a2e05e0543570821582480ff823ba5
 a462612b64e97fa7dfe461c32c58553fd6ec63c5
+# ... (additional commits may be present)
+EOF
+)
+
+# From spack-packages.sh (illustrative — see spack-packages.sh for actual commits)
+SPACKPACKAGES_VERSION="v2025.11.0"
+SPACKPACKAGES_CHERRYPICKS=$(cat <<- EOF
+a115a811bdfce4db5298a9ba9b7903ccfb0de101
+22dadd619053ff0872903549db616200bda082f0
+# ... (additional commits may be present)
 EOF
 )
 ```