remove spack_version from templates

Author: bcumming

stackinator/templates/Make.user

@@ -37,12 +37,7 @@ export SPACK_COLOR := always
 # config files in ~/.spack. Note that our recommended bwrap setup already puts
 # a tmpfs in the home folder, but when bwrap isn't used, this also helps a bit
 # with reproducibility.
-{% if spack_version>="0.22" %}
-# spack after 0.22.1 chokes on /dev/null
 export SPACK_USER_CONFIG_PATH := ~
-{% else %}
-export SPACK_USER_CONFIG_PATH := /dev/null
-{% endif %}
 
 # Set up the system config scope that has the system packages we don't want
 # build, for example slurm, pmix, etc. Also should have the system compiler.

stackinator/templates/stack-debug.sh

@@ -1 +1 @@
-env --ignore-environment PATH=/usr/bin:/bin:{{ build_path }}/spack/bin http_proxy=$http_proxy https_proxy=$https_proxy HOME=$HOME BUILD_ROOT={{ build_path }} STORE={{ mount_path }} SPACK_SYSTEM_CONFIG_PATH={{ build_path }}/config SPACK_USER_CACHE_PATH={{ build_path }}/cache SPACK=spack SPACK_COLOR=always SPACK_USER_CONFIG_PATH={% if spack_version>="0.23" %}~{% else %}/dev/null{% endif %} LC_ALL=en_US.UTF-8 TZ=UTC SOURCE_DATE_EPOCH=315576060 {% if use_bwrap %} {{ build_path }}/bwrap-mutable-root.sh --tmpfs ~ --bind {{ build_path }}/tmp /tmp --bind {{ build_path }}/store {{ mount_path }} {% endif %} bash -noprofile -l
+env --ignore-environment PATH=/usr/bin:/bin:{{ build_path }}/spack/bin http_proxy=$http_proxy https_proxy=$https_proxy HOME=$HOME BUILD_ROOT={{ build_path }} STORE={{ mount_path }} SPACK_SYSTEM_CONFIG_PATH={{ build_path }}/config SPACK_USER_CACHE_PATH={{ build_path }}/cache SPACK=spack SPACK_COLOR=always SPACK_USER_CONFIG_PATH=~ LC_ALL=en_US.UTF-8 TZ=UTC SOURCE_DATE_EPOCH=315576060 {% if use_bwrap %} {{ build_path }}/bwrap-mutable-root.sh --tmpfs ~ --bind {{ build_path }}/tmp /tmp --bind {{ build_path }}/store {{ mount_path }} {% endif %} bash -noprofile -l