Correcting specs

ci/setup_spack.sh

@@ -49,21 +49,15 @@ done
 
 cp -r "${STACK_CONFIG_PATH}/templates" ${SPACK_SYSTEM_CONFIG_PATH}
 
-if [ ! -e ${SPACK_SYSTEM_CONFIG_PATH}/config.yaml ]
-then
-  echo "config:" >> ${SPACK_SYSTEM_CONFIG_PATH}/config.yaml
-fi
 
-cat <<EOF >> ${SPACK_SYSTEM_CONFIG_PATH}/config.yaml
+cat <<EOF >> ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
+config:
   template_dirs:
     - ${SPACK_SYSTEM_CONFIG_PATH}/templates
-
-  build_stage:
-    - \$tempdir/\$user/spack-stage
 EOF
 
-cat <<EOF >> ${SPACK_SYSTEM_CONFIG_PATH}/modules_stack.yaml
-modules
+cat <<EOF > ${SPACK_SYSTEM_CONFIG_PATH}/modules_stack.yaml
+modules:
   default:
     roots:
       lmod: ${STACK_LOCATION}/spack/share/spack/lmod/${environment}

stacks/pinot-noir/config.yaml

@@ -4,3 +4,6 @@ config:
 
   install_tree:
     padded_length: 242
+
+  build_stage:
+    - $tempdir/$user/spack-stage

stacks/pinot-noir/spack.yaml

 spack:
   include:
       - compiler_definitions.yaml
+
       - packages_stack.yaml
       - packages_env.yaml
+
       - modules_stack.yaml
+
       - definitions_env.yaml
 
+      - config_stack.yaml
+
   definitions:
     # -------------------------------------------------------------------------
     # PE definition
@@ -44,7 +49,6 @@ spack:
         - libjpeg-turbo
         - libpng
         - libtiff
-        - libxc
         - libxml2
         - lmod
         - mpfr
@@ -75,9 +79,10 @@ spack:
         - hdf5 ~mpi
         - hisat2
         - htslib
-        - hwloc:
+        - hwloc
         - intel-oneapi-tbb
         - jasper
+        - libxc
         - mafft
         - metis
         - muscle