Bump Spack commit and rework tutorial stack

.ci/env

@@ -1,2 +1,2 @@
-SPACK_CHECKOUT_VERSION=a429ffcb690fc2098657e6ed14e12ad6af48c928
+SPACK_CHECKOUT_VERSION=06f3ac473591a77e6a623838fc2b164b7c06023b
 SPACK_CHECKOUT_REPO=spack/spack

stacks/tutorial/spack.yaml

@@ -3,58 +3,78 @@ spack:
 
   include:
   - ../../.ci/gitlab/
+
   packages:
     all:
-      require: target=x86_64_v3
+      require:
+      - target=x86_64_v3
     tbb:
       require: intel-tbb
-  definitions:
-  - gcc_system_packages:
-    - matrix:
-      - - zlib-ng
-        - zlib-ng@2.0.7
-        - zlib-ng@2.0.7 cflags=-O3
-        - tcl
-        - tcl ^zlib-ng@2.0.7 cflags=-O3
-        - hdf5
-        - hdf5~mpi
-        - hdf5+hl+mpi ^mpich
-        - trilinos
-        - trilinos +hdf5 ^hdf5+hl+mpi ^mpich
-        - gcc@12.3 ~binutils  # todo: enable ~binutils once unify: true is used
-        - mpileaks
-        - lmod@8.7.18
-        - environment-modules
-        - macsio@1.1+scr ^scr@2.0.0~fortran ^silo~fortran ^hdf5~fortran
-        - julia@1.9 ^llvm ~clang ~gold ~lldb ~lua ~polly compiler-rt=none libcxx=none libunwind=none targets=x86 ^openblas threads=openmp
-        - vim
-      - ['%gcc@11']
-  - gcc_old_packages:
-    - zlib-ng%gcc@10
-  - clang_packages:
-    - matrix:
-      - [zlib-ng, tcl ^zlib-ng@2.0.7]
-      - ['%clang@14']
-  - gcc_spack_built_packages:
+
+  specs:
+  - group: compiler
+    specs:
+    - gcc@12 ~binutils
+
+  - group: "gcc@11 specs"
+    specs:
+    - zlib-ng@2.2.4
+    - zlib-ng@2.0.7
+    - zlib-ng@2.0.7 cflags=-O3
+    - tcl ^zlib-ng@2.2.4
+    - tcl ^zlib-ng@2.0.7 cflags=-O3
+    - hdf5+mpi^openmpi
+    - hdf5~mpi
+    - hdf5+hl+mpi ^mpich
+    - trilinos ^openmpi
+    - trilinos +hdf5 ^hdf5+hl+mpi ^mpich
+    - mpileaks
+    - lmod@8.7.18
+    - environment-modules
+    - macsio@1.1+scr ^scr@2.0.0~fortran ^silo~fortran ^hdf5~fortran
+    - julia@1.9 ^llvm ~clang ~gold ~lldb ~lua ~polly compiler-rt=none libcxx=none libunwind=none targets=x86 ^openblas threads=openmp
+    - vim
+    override:
+      packages:
+        c:
+          prefer: [gcc@11]
+        cxx:
+          prefer: [gcc@11]
+        fortran:
+          prefer: [gcc@11]
+
+  - group: scalapacks
+    needs: [compiler]
+    specs:
     - matrix:
       - [netlib-scalapack]
       - [^mpich, ^openmpi]
       - [^openblas, ^netlib-lapack]
-      - ['%gcc@12']
     - matrix:
       - [py-scipy ^openblas, armadillo ^openblas, netlib-lapack, openmpi, mpich, elpa ^mpich]
-      - ['%gcc@12']
-  specs:
-  - $gcc_system_packages
-  - $gcc_old_packages
-  - $clang_packages
-  - $gcc_spack_built_packages
+    override:
+      packages:
+        c:
+          prefer: [gcc@12]
+        cxx:
+          prefer: [gcc@12]
+        fortran:
+          prefer: [gcc@12]
+  # Miscellaneous specs use the default group
+  - zlib-ng@2.2.4%gcc@10
+  - matrix:
+    - [ zlib-ng@2.2.4, tcl ^zlib-ng@2.0.7 ]
+    - [ '%clang@14' ]
+
+  concretizer:
+    unify: false
 
   ci:
     pipeline-gen:
     - build-job:
         image:
           name: ghcr.io/spack/tutorial-ubuntu-22.04:v2023-10-30
           entrypoint: ['']
+
   cdash:
     build-group: Spack Tutorial