diff --git a/lib/yashchiki/commons.sh b/lib/yashchiki/commons.sh index 5afdceafa72afa974874a29075520689edda0770..b0816fbb278934f86f800519b4b2d14b6827ed78 100755 --- a/lib/yashchiki/commons.sh +++ b/lib/yashchiki/commons.sh @@ -170,9 +170,6 @@ fi # PACKAGES # ############ -# the version of dev tools we want in our view -SPEC_VIEW_VISIONARY_DEV_TOOLS="visionary-dev-tools ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" - # used in VIEWS section below but needs to be defined before sourcing # associative array: spec to add -> view names seperated by spaces declare -A spack_add_to_view diff --git a/share/yashchiki/styles/asic/spack_collection.sh b/share/yashchiki/styles/asic/spack_collection.sh index be74a8e247781303027c96d54708e2f6f7121b10..de3317968c52cfbbc79ad9cd54e05fc7c1699dde 100644 --- a/share/yashchiki/styles/asic/spack_collection.sh +++ b/share/yashchiki/styles/asic/spack_collection.sh @@ -1,6 +1,6 @@ # All spack packages that should be fetched/installed in the container spack_packages=( -# "${SPEC_VIEW_VISIONARY_DEV_TOOLS}" # FIXME +# "visionary-dev-tools ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" # FIXME "visionary-asic ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" ) diff --git a/share/yashchiki/styles/visionary/spack_collection.sh b/share/yashchiki/styles/visionary/spack_collection.sh index 462b9133894beaa7ba2eacc43a0144e80ee918f6..bd7b9054a0d24989aa4a35d0a4c975af2e6baad1 100644 --- a/share/yashchiki/styles/visionary/spack_collection.sh +++ b/share/yashchiki/styles/visionary/spack_collection.sh @@ -1,6 +1,6 @@ # All spack packages that should be fetched/installed in the container spack_packages=( - "${SPEC_VIEW_VISIONARY_DEV_TOOLS}" + "visionary-dev-tools ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" # START python 3 packages "visionary-wafer~dev ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" "visionary-wafer ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" diff --git a/share/yashchiki/styles/visionary/spack_custom_view.sh b/share/yashchiki/styles/visionary/spack_custom_view.sh index 82c70d155f9cf4fcf490aa916da08d682242ef21..68c2764bfd28e53961b3ced45bbcf1d1f5945c9b 100644 --- a/share/yashchiki/styles/visionary/spack_custom_view.sh +++ b/share/yashchiki/styles/visionary/spack_custom_view.sh @@ -22,5 +22,5 @@ ${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlin # dev tools # ############# -${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-dev-tools $(get_latest_hash "${SPEC_VIEW_VISIONARY_DEV_TOOLS}") +${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-dev-tools $(get_latest_hash "visionary-dev-tools ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}") EOF