From 87e344df869b1d4522f1ad47e2d05c7b8f3711c4 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Wed, 8 Jul 2026 09:01:38 -0500
Subject: [PATCH] chore: spack-v1.2.1

---
 spack.sh | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/spack.sh b/spack.sh
index d6c0e70e..91c39d6c 100644
--- a/spack.sh
+++ b/spack.sh
@@ -5,17 +5,13 @@ SPACK_ORGREPO="spack/spack"
 
 ## Spack github version, e.g. v0.18.1 or commit hash
 ## note: nightly builds will use e.g. releases/v1.0
-SPACK_VERSION="v1.2.0"
+SPACK_VERSION="v1.2.1"
 
 ## Space-separated list of spack cherry-picks
 read -r -d '' SPACK_CHERRYPICKS <<- \
 --- || true
 292b0dcaba3b2a5e3f9668d205d39fee2c715721
 678e506a95b319c573ba7e84703b06d7275ab80e
-2b588bdf631a22a55630981aa69365197a9258f7
-2ec34f3a913fe32017682ccbc9518b7111255f6b
-69329c85739c6030d6f60c00aa03ebcaf4e22037
-44fa40a0367ab59f756fc24791395e1ec56d2712
 ---
 ## Optional hash table with comma-separated file list
 read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
@@ -25,7 +21,3 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
 ## [hash]: [description]
 ## 292b0dcaba3b2a5e3f9668d205d39fee2c715721: fix: write created time field with OCI buildcache config
 ## 678e506a95b319c573ba7e84703b06d7275ab80e: fix: don't map prefix to view root for pkgs excluded from view
-## 2b588bdf631a22a55630981aa69365197a9258f7: fix: install missing upstream packages in local store
-## 2ec34f3a913fe32017682ccbc9518b7111255f6b: fix: install missing upstream packages in local store (new installer)
-## 69329c85739c6030d6f60c00aa03ebcaf4e22037: fix: also avoid raise InstallError later in new_installer; add unit-test
-## 44fa40a0367ab59f756fc24791395e1ec56d2712: view: fix rename on overlayfs issue