From e1f45583bb1e69b0ded151c3c99865d7a13253aa Mon Sep 17 00:00:00 2001
From: Matthias Krack <matthias.krack@psi.ch>
Date: Thu, 25 Dec 2025 14:31:29 +0100
Subject: [PATCH] Spack packages 2025.07.0 -> 2025.11.0

---
 ci/docker/build_deps_spack.Dockerfile   | 4 +++-
 tools/docker/Dockerfile.test_spack_psmp | 2 +-
 tools/docker/Dockerfile.test_spack_ssmp | 2 +-
 tools/docker/generate_dockerfiles.py    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ci/docker/build_deps_spack.Dockerfile b/ci/docker/build_deps_spack.Dockerfile
index 512541ab63..6eddaeb97d 100644
--- a/ci/docker/build_deps_spack.Dockerfile
+++ b/ci/docker/build_deps_spack.Dockerfile
@@ -62,7 +62,7 @@ WORKDIR /root/spack
 ARG SPACK_VERSION
 ENV SPACK_VERSION=${SPACK_VERSION:-1.1.0}
 ARG SPACK_PACKAGES_VERSION
-ENV SPACK_PACKAGES_VERSION=${SPACK_PACKAGES_VERSION:-2025.07.0}
+ENV SPACK_PACKAGES_VERSION=${SPACK_PACKAGES_VERSION:-2025.11.0}
 ARG SPACK_REPO=https://github.com/spack/spack
 ENV SPACK_ROOT=/opt/spack-${SPACK_VERSION}
 ARG SPACK_PACKAGES_REPO=https://github.com/spack/spack-packages
@@ -99,5 +99,7 @@ RUN spack env create myenv cp2k_deps_${CP2K_VERSION}.yaml && \
 RUN spack -e myenv concretize -f
 RUN spack -e myenv env depfile -o spack_makefile
 RUN make -j${NUM_PROCS} --file=spack_makefile SPACK_COLOR=never --output-sync=recurse
+ENV SPACK_ENV_VIEW="${SPACK_ROOT}/view"
+RUN cp -ar ${SPACK_ENV_VIEW}/bin ${SPACK_ENV_VIEW}/include ${SPACK_ENV_VIEW}/lib /opt/spack
 
 # EOF
diff --git a/tools/docker/Dockerfile.test_spack_psmp b/tools/docker/Dockerfile.test_spack_psmp
index afa605ef24..19f3b9681e 100644
--- a/tools/docker/Dockerfile.test_spack_psmp
+++ b/tools/docker/Dockerfile.test_spack_psmp
@@ -50,7 +50,7 @@ WORKDIR /root/spack
 ARG SPACK_VERSION
 ENV SPACK_VERSION=${SPACK_VERSION:-1.1.0}
 ARG SPACK_PACKAGES_VERSION
-ENV SPACK_PACKAGES_VERSION=${SPACK_PACKAGES_VERSION:-2025.07.0}
+ENV SPACK_PACKAGES_VERSION=${SPACK_PACKAGES_VERSION:-2025.11.0}
 ARG SPACK_REPO=https://github.com/spack/spack
 ENV SPACK_ROOT=/opt/spack-${SPACK_VERSION}
 ARG SPACK_PACKAGES_REPO=https://github.com/spack/spack-packages
diff --git a/tools/docker/Dockerfile.test_spack_ssmp b/tools/docker/Dockerfile.test_spack_ssmp
index 2730b5ae22..813aefdc8e 100644
--- a/tools/docker/Dockerfile.test_spack_ssmp
+++ b/tools/docker/Dockerfile.test_spack_ssmp
@@ -50,7 +50,7 @@ WORKDIR /root/spack
 ARG SPACK_VERSION
 ENV SPACK_VERSION=${SPACK_VERSION:-1.1.0}
 ARG SPACK_PACKAGES_VERSION
-ENV SPACK_PACKAGES_VERSION=${SPACK_PACKAGES_VERSION:-2025.07.0}
+ENV SPACK_PACKAGES_VERSION=${SPACK_PACKAGES_VERSION:-2025.11.0}
 ARG SPACK_REPO=https://github.com/spack/spack
 ENV SPACK_ROOT=/opt/spack-${SPACK_VERSION}
 ARG SPACK_PACKAGES_REPO=https://github.com/spack/spack-packages
diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py
index 861cc5a5cf..413d47fa6f 100755
--- a/tools/docker/generate_dockerfiles.py
+++ b/tools/docker/generate_dockerfiles.py
@@ -689,7 +689,7 @@ WORKDIR /root/spack
 ARG SPACK_VERSION
 ENV SPACK_VERSION=${{SPACK_VERSION:-1.1.0}}
 ARG SPACK_PACKAGES_VERSION
-ENV SPACK_PACKAGES_VERSION=${{SPACK_PACKAGES_VERSION:-2025.07.0}}
+ENV SPACK_PACKAGES_VERSION=${{SPACK_PACKAGES_VERSION:-2025.11.0}}
 ARG SPACK_REPO=https://github.com/spack/spack
 ENV SPACK_ROOT=/opt/spack-${{SPACK_VERSION}}
 ARG SPACK_PACKAGES_REPO=https://github.com/spack/spack-packages