Improve logging on broken symlinks wrt #880

Wrt #180

.cirrus.yml

@@ -1,10 +1,11 @@
 freebsd_instance:
-  image_family: freebsd-13-1
+  image_family: freebsd-13-2
 
-task:
+build_task:
+  name: build
   env:
     GHC_VER: 9.2.4
-    CABAL_VER: 3.6.2.0
+    CABAL_VER: 3.8.1.0
     ARTIFACT: "x86_64-portbld-freebsd-ghcup"
     ARCH: 64
     RUNNER_OS: FreeBSD
@@ -12,10 +13,12 @@ task:
     GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
     JSON_VERSION: "0.0.7"
     CIRRUS_CLONE_SUBMODULES: true
-    AWS_ACCESS_KEY_ID: ENCRYPTED[3e99c4ac040871f213abd616ec66952d954dc289cdd97772f88e58a74d08a2250133437780fe98b7aedf7ef1fb32f5eb]
-    AWS_SECRET_ACCESS_KEY: ENCRYPTED[5910cfd77a922ff7fc06eeb6a6b9f79d4867863e541f06eb2c4cfecae0613650e3e0588373fa8d9249d295d76cf9cb3b]
+    AWS_ACCESS_KEY_ID: ENCRYPTED[6ed6287e2dd78ab5f84b22232c5245834ab042bd8ba443883aaf4b4d1ecc0481add1fdfad5ae6f6a8cfb418e6f19b2fc]
+    AWS_SECRET_ACCESS_KEY: ENCRYPTED[16f3cda2954c7cee99444e6788eb5997382aa4ce1477e7523fef2586077541f43b5c816156961fc6b4677259679875a7]
     S3_HOST: ENCRYPTED[ce961780a33159f7d1d8046956b5ac6ebc3bfc8149428e5f538576cda51d9f3d0c35b79cdd1e325793639ff6e31f889d]
-  install_script: pkg install -y ghc hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake llvm14
+  install_script:
+    - sed -i.bak -e 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
+    - pkg install -y ghc hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake llvm14
   script:
     - tzsetup Etc/GMT
     - adjkerntz -a

.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+end_of_line = LF
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.hs]
+indent_style = space
+indent_size = 2
+max_line_length = 80

.github/scripts/bootstrap.sh

@@ -2,7 +2,7 @@
 
 set -eux
 
-. .github/scripts/prereq.sh
+. .github/scripts/env.sh
 
 mkdir -p "$CI_PROJECT_DIR"/.local/bin
 
@@ -13,4 +13,6 @@ git describe --always
 ./scripts/bootstrap/bootstrap-haskell
 
 [ "$(ghc --numeric-version)" = "${BOOTSTRAP_HASKELL_GHC_VERSION}" ]
+# https://github.com/actions/runner-images/issues/7061
+[ "$(ghcup config | grep --color=never meta-mode)" = "meta-mode: Lax" ]
 

.github/scripts/brew.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -eux
+
+. .github/scripts/env.sh
+
+if [ -e "$HOME/.brew" ] ; then
+	(
+	cd "$HOME/.brew"
+	git fetch --depth 1
+	git reset --hard origin/master
+	)
+else
+	git clone --depth=1 https://github.com/Homebrew/brew "$HOME/.brew"
+fi
+export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$PATH"
+
+mkdir -p $CI_PROJECT_DIR/.brew_cache
+export HOMEBREW_CACHE=$CI_PROJECT_DIR/.brew_cache
+mkdir -p $CI_PROJECT_DIR/.brew_logs
+export HOMEBREW_LOGS=$CI_PROJECT_DIR/.brew_logs
+mkdir -p /private/tmp/.brew_tmp
+export HOMEBREW_TEMP=/private/tmp/.brew_tmp
+
+brew update
+brew install ${1+"$@"}
+

.github/scripts/build.sh

@@ -2,75 +2,36 @@
 
 set -eux
 
-. .github/scripts/prereq.sh
 . .github/scripts/common.sh
 
-
-# ensure ghcup
-if ! command -v ghcup ; then
-	install_ghcup
-fi
-
-# ensure cabal-cache
-if ! cabal-cache version ; then
-	download_cabal_cache "$HOME/.local/bin/cabal-cache"
-fi
-
-# ensure ghc
-if [ "${RUNNER_OS}" != "FreeBSD" ] ; then
-	if [ "${DISTRO}" != "Debian" ] ; then # ! armv7 or aarch64 linux
-		if ! "ghc-${GHC_VER}" --numeric-version ; then
-			ghcup -v install ghc --set --force "$GHC_VER"
-		fi
-		if [ "$(cabal --numeric-version || true)" != "${CABAL_VER}" ] ; then
-			ghcup -v install cabal --force "$CABAL_VER"
-		fi
-		ghc --version
-		cabal --version
-		GHC="ghc-${GHC_VER}"
-	else
-		if [ "$(cabal --numeric-version || true)" != "${CABAL_VER}" ] ; then
-			ghcup -v install cabal --force "$CABAL_VER"
-		fi
-		cabal --version
-		GHC="ghc"
-	fi
-else
-	ghc --version
-	cabal --version
-	GHC="ghc"
-fi
-
 git_describe
 
+# ensure ghcup
+install_ghcup
+
+# ensure cabal-cache
+download_cabal_cache "$HOME/.local/bin/cabal-cache"
+
+# install toolchain (if necessary)
+ghcup -v install ghc --set --force "$GHC_VER"
+ghcup -v install cabal --force "$CABAL_VER"
+ghc --version
+cabal --version
+GHC="ghc-${GHC_VER}"
 
 # build
 ecabal update
-
-if [ "${RUNNER_OS}" = "Linux" ] ; then
-	if [ "${ARCH}" = "32" ] ; then
-		build_with_cache -w "${GHC}" --ghc-options='-split-sections -optl-static' -ftui --enable-tests
-	elif [ "${ARCH}" = "64" ] ; then
-		build_with_cache -w "${GHC}" --ghc-options='-split-sections -optl-static' -ftui --enable-tests
-	else
-		build_with_cache -w "${GHC}" -ftui --enable-tests
-	fi
-elif [ "${RUNNER_OS}" = "FreeBSD" ] ; then
-	build_with_cache -w "${GHC}" --ghc-options='-split-sections -pgmc clang++14' --constraint="zlib +bundled-c-zlib" --constraint="zip +disable-zstd" -ftui --enable-tests
-elif [ "${RUNNER_OS}" = "Windows" ] ; then
-	build_with_cache -w "${GHC}" --constraint="zlib +bundled-c-zlib" --constraint="lzma +static" --enable-tests
-else
-	build_with_cache -w "${GHC}" --constraint="zlib +bundled-c-zlib" --constraint="lzma +static" -ftui --enable-tests
-fi
-
+build_with_cache --project-file=cabal.project.release -w "${GHC}" --enable-tests
 
 # set up artifacts
 mkdir -p out
-binary=$(cabal list-bin ghcup)
-binary_test=$(cabal list-bin ghcup-test)
+binary=$(cabal --project-file=cabal.project.release list-bin ghcup)
+binary_test=$(cabal --project-file=cabal.project.release list-bin ghcup-test)
+binary_opttest=$(cabal --project-file=cabal.project.release list-bin ghcup-optparse-test)
 ver=$("${binary}" --numeric-version)
 strip_binary "${binary}"
-cp "${binary}" "out/${ARTIFACT}-${ver}"
-cp "${binary_test}" "out/test-${ARTIFACT}-${ver}"
+cp "${binary}" "out/${ARTIFACT}-${ver}${ext}"
+cp "${binary_test}" "out/test-${ARTIFACT}-${ver}${ext}"
+cp "${binary_opttest}" "out/test-optparse-${ARTIFACT}-${ver}${ext}"
 cp ./dist-newstyle/cache/plan.json "out/${ARTIFACT}.plan.json"
 

.github/scripts/cabal-cache.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+case "$(uname -s)" in
+	MSYS_*|MINGW*)
+		ext=".exe"
+		;;
+	*)
+		ext=""
+	   ;;
+esac
+
+echo "cabal-cache disabled (CABAL_CACHE_DISABLE set)"
+

.github/scripts/common.sh

@@ -1,23 +1,13 @@
 #!/bin/sh
 
-if [ "${RUNNER_OS}" = "Windows" ] ; then
-	ext=".exe"
-else
-	ext=''
-fi
+. .github/scripts/env.sh
 
 ecabal() {
 	cabal "$@"
 }
 
-sync_from_retry() {
-	if [ "${RUNNER_OS}" != "Windows" ] ; then
-		cabal_store_path="$(dirname "$(cabal help user-config | tail -n 1 | xargs)")/store"
-	else
-		cabal_store_path="${CABAL_DIR}/store"
-	fi
-
-    sync_from || { sleep 9 ; rm -rf "${cabal_store_path:?}"/* ; sync_from || { sleep 20 ; rm -rf "${cabal_store_path:?}"/* ; sync_from ; } }
+nonfatal() {
+	"$@" || "$* failed"
 }
 
 sync_from() {
@@ -25,7 +15,7 @@ sync_from() {
 		cabal_store_path="$(dirname "$(cabal help user-config | tail -n 1 | xargs)")/store"
 	fi
 
-	cabal-cache sync-from-archive \
+	cabal-cache.sh sync-from-archive \
 		--host-name-override=${S3_HOST} \
 		--host-port-override=443 \
 		--host-ssl-override=True \
@@ -34,16 +24,12 @@ sync_from() {
 		--archive-uri "s3://ghcup-hs/${RUNNER_OS}-${ARCH}-${DISTRO}"
 }
 
-sync_to_retry() {
-    sync_to || { sleep 9 ; sync_to || { sleep 20 ; sync_to ; } }
-}
-
 sync_to() {
 	if [ "${RUNNER_OS}" != "Windows" ] ; then
 		cabal_store_path="$(dirname "$(cabal help user-config | tail -n 1 | xargs)")/store"
 	fi
 
-	cabal-cache sync-to-archive \
+	cabal-cache.sh sync-to-archive \
 		--host-name-override=${S3_HOST} \
 		--host-port-override=443 \
 		--host-ssl-override=True \
@@ -81,6 +67,7 @@ git_describe() {
 download_cabal_cache() {
 	(
 	set -e
+	mkdir -p "$HOME/.local/bin"
 	dest="$HOME/.local/bin/cabal-cache"
     url=""
 	exe=""
@@ -128,31 +115,46 @@ download_cabal_cache() {
 		mv "cabal-cache${exe}" "${dest}${exe}"
 		chmod +x "${dest}${exe}"
 	fi
+
+	# install shell wrapper
+	cp "${CI_PROJECT_DIR}"/.github/scripts/cabal-cache.sh "$HOME"/.local/bin/
+	chmod +x "$HOME"/.local/bin/cabal-cache.sh
     )
 }
 
 build_with_cache() {
 	ecabal configure "$@"
 	ecabal build --dependencies-only "$@" --dry-run
-	sync_from_retry
-	ecabal build --dependencies-only "$@" || sync_to_retry
-	sync_to_retry
+	sync_from
+	ecabal build --dependencies-only "$@" || sync_to
+	sync_to
 	ecabal build "$@"
-	sync_to_retry
+	sync_to
 }
 
 install_ghcup() {
-	find "$GHCUP_INSTALL_BASE_PREFIX"
-	mkdir -p "$GHCUP_BIN"
-	mkdir -p "$GHCUP_BIN"/../cache
+	case "${RUNNER_OS}" in
+		"Linux")
+			case "${ARCH}" in
+				"ARM"*)
+					if command -v ghcup ; then
+						mkdir -p "$GHCUP_BIN"
+						cp "$(command -v ghcup)" "$GHCUP_BIN/ghcup${ext}"
+					else
+						install_ghcup_curl_sh
+					fi
+					;;
+				*) install_ghcup_curl_sh
+					;;
+			esac
+			;;
+			*) install_ghcup_curl_sh
+			;;
+	esac
+}
 
-	if [ "${RUNNER_OS}" = "FreeBSD" ] ; then
-		curl -o ghcup https://downloads.haskell.org/ghcup/tmp/x86_64-portbld-freebsd-ghcup-0.1.18.1
-		chmod +x ghcup
-		mv ghcup "$HOME/.local/bin/ghcup"
-	else
-		curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_MINIMAL=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=yes sh
-	fi
+install_ghcup_curl_sh() {
+	curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_MINIMAL=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=yes sh
 }
 
 strip_binary() {

.github/scripts/cross.sh

@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+
+set -ex
+
+. .github/scripts/common.sh
+
+run() {
+    "$@"
+}
+
+if [ "${OS}" = "Windows" ] ; then
+	GHCUP_DIR="${GHCUP_INSTALL_BASE_PREFIX}"/ghcup
+else
+	GHCUP_DIR="${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup
+fi
+
+git_describe
+
+rm -rf "${GHCUP_DIR}"
+mkdir -p "${GHCUP_BIN}"
+
+cp "out/${ARTIFACT}"-* "$GHCUP_BIN/ghcup${ext}"
+cp "out/test-${ARTIFACT}"-* "ghcup-test${ext}"
+chmod +x "$GHCUP_BIN/ghcup${ext}"
+chmod +x "ghcup-test${ext}"
+
+"$GHCUP_BIN/ghcup${ext}" --version
+eghcup --version
+sha_sum "$GHCUP_BIN/ghcup${ext}"
+sha_sum "$(raw_eghcup --offline whereis ghcup)"
+
+
+### cross build
+
+eghcup --numeric-version
+
+eghcup install ghc "${GHC_VER}"
+eghcup set ghc "${GHC_VER}"
+eghcup install cabal "${CABAL_VER}"
+
+cabal --version
+
+eghcup debug-info
+
+ecabal update
+
+"${WRAPPER}" "$GHCUP_BIN/ghcup${ext}" -c -s "file://$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml" -v \
+	compile ghc \
+	$(if [ -n "${HADRIAN_FLAVOUR}" ] ; then printf "%s" "--flavour=${HADRIAN_FLAVOUR}" ; else true ; fi) \
+	-j "$(nproc)" \
+	-v "${GHC_TARGET_VERSION}" \
+	-b "${GHC_VER}" \
+	-x "${CROSS}" \
+	-- ${BUILD_CONF_ARGS}
+eghcup set ghc "${CROSS}-${GHC_TARGET_VERSION}"
+
+[ "$($(eghcup whereis ghc "${CROSS}-${GHC_TARGET_VERSION}") --numeric-version)" = "${GHC_TARGET_VERSION}" ]
+
+# test that doing fishy symlinks into GHCup dir doesn't cause weird stuff on 'ghcup nuke'
+mkdir no_nuke/
+mkdir no_nuke/bar
+echo 'foo' > no_nuke/file
+echo 'bar' > no_nuke/bar/file
+ln -s "$CI_PROJECT_DIR"/no_nuke/ "${GHCUP_DIR}"/cache/no_nuke
+ln -s "$CI_PROJECT_DIR"/no_nuke/ "${GHCUP_DIR}"/logs/no_nuke
+
+# nuke
+eghcup nuke
+[ ! -e "${GHCUP_DIR}" ]
+
+# make sure nuke doesn't resolve symlinks
+[ -e "$CI_PROJECT_DIR"/no_nuke/file ]
+[ -e "$CI_PROJECT_DIR"/no_nuke/bar/file ]
+

.github/scripts/env.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+if [ "${RUNNER_OS}" = "Windows" ] ; then
+	ext=".exe"
+else
+	ext=''
+fi
+
+export DEBIAN_FRONTEND=noninteractive
+export TZ=Asia/Singapore
+
+export OS="$RUNNER_OS"
+export PATH="$HOME/.local/bin:$PATH"
+
+if [ "${RUNNER_OS}" = "Windows" ] ; then
+	# on windows use pwd to get unix style path
+	CI_PROJECT_DIR="$(pwd)"
+	export CI_PROJECT_DIR
+    export GHCUP_INSTALL_BASE_PREFIX="/c"
+    export GHCUP_BIN="$GHCUP_INSTALL_BASE_PREFIX/ghcup/bin"
+    export PATH="$GHCUP_BIN:$PATH"
+	export CABAL_DIR="C:\\Users\\runneradmin\\AppData\\Roaming\\cabal"
+else
+	export CI_PROJECT_DIR="${GITHUB_WORKSPACE}"
+    export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR"
+    export GHCUP_BIN="$GHCUP_INSTALL_BASE_PREFIX/.ghcup/bin"
+    export PATH="$GHCUP_BIN:$PATH"
+    export CABAL_DIR="$CI_PROJECT_DIR/cabal"
+    export CABAL_CACHE="$CI_PROJECT_DIR/cabal-cache"
+fi

.github/scripts/hls.sh

@@ -2,7 +2,6 @@
 
 set -eux
 
-. .github/scripts/prereq.sh
 . .github/scripts/common.sh
 
 mkdir -p "$CI_PROJECT_DIR"/.local/bin
@@ -34,7 +33,7 @@ sha_sum "$(raw_eghcup --offline whereis ghcup)"
 git_describe
 
 eghcup install ghc "${GHC_VERSION}"
-eghcup install cabal
+eghcup install cabal "${CABAL_VERSION}"
 
 ecabal update
 
@@ -57,9 +56,9 @@ eghcup debug-info
 	cd "haskell-language-server-${HLS_TARGET_VERSION}/"
 	ecabal configure -w "ghc-${GHC_VERSION}" --disable-profiling --disable-tests --jobs="$(nproc)"
 	ecabal build --dependencies-only -w "ghc-${GHC_VERSION}" --disable-profiling --disable-tests --jobs="$(nproc)" --dry-run
-	sync_from_retry
+	sync_from
 	ecabal build --dependencies-only -w "ghc-${GHC_VERSION}" --disable-profiling --disable-tests --jobs="$(nproc)" || sync_to
-	sync_to_retry
+	sync_to
 )
 
 eghcup -v compile hls -j "$(nproc)" -g "${HLS_TARGET_VERSION}" --ghc "${GHC_VERSION}"

.github/scripts/prereq.sh

@@ -1,66 +0,0 @@
-#!/bin/sh
-
-mkdir -p "$HOME"/.local/bin
-
-export OS="$RUNNER_OS"
-export PATH="$HOME/.local/bin:$PATH"
-: "${APT_GET:=apt-get}"
-
-if [ "${RUNNER_OS}" = "Windows" ] ; then
-	# on windows use pwd to get unix style path
-	CI_PROJECT_DIR="$(pwd)"
-	export CI_PROJECT_DIR
-    export GHCUP_INSTALL_BASE_PREFIX="/c"
-    export GHCUP_BIN="$GHCUP_INSTALL_BASE_PREFIX/ghcup/bin"
-    export PATH="$GHCUP_BIN:$PATH"
-	export CABAL_DIR="C:\\Users\\runneradmin\\AppData\\Roaming\\cabal"
-else
-	export CI_PROJECT_DIR="${GITHUB_WORKSPACE}"
-    export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR"
-    export GHCUP_BIN="$GHCUP_INSTALL_BASE_PREFIX/.ghcup/bin"
-    export PATH="$GHCUP_BIN:$PATH"
-    export CABAL_DIR="$CI_PROJECT_DIR/cabal"
-    export CABAL_CACHE="$CI_PROJECT_DIR/cabal-cache"
-fi
-
-if [ "${RUNNER_OS}" = "Linux" ] ; then
-	if [ "${DISTRO}" = "Alpine" ] ; then
-		:
-	elif [ "${DISTRO}" = "Ubuntu" ] ; then
-		export DEBIAN_FRONTEND=noninteractive
-		export TZ=Asia/Singapore
-		if [ "${ARCH}" = "ARM64" ] || [ "${ARCH}" = "ARM" ] ; then
-			:
-		else
-			${APT_GET} install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl gzip
-		fi
-	elif [ "${DISTRO}" = "Debian" ] ; then
-		export DEBIAN_FRONTEND=noninteractive
-		export TZ=Asia/Singapore
-		${APT_GET} install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip
-	fi
-elif [ "${RUNNER_OS}" = "macOS" ] ; then
-	if ! command -v brew ; then
-		[ -e "$HOME/.brew" ] ||
-			git clone --depth=1 https://github.com/Homebrew/brew "$HOME/.brew"
-		export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$PATH"
-		brew update
-	fi
-	if ! command -v git ; then
-		brew install git
-	fi
-	if ! command -v realpath ; then
-		brew install coreutils
-	fi
-
-    if [ "${ARCH}" = "ARM64" ] ; then
-		brew install llvm@11 autoconf automake
-		export PATH="$HOME/.brew/opt/llvm@11/bin:$PATH"
-		export CC="$HOME/.brew/opt/llvm@11/bin/clang"
-		export CXX="$HOME/.brew/opt/llvm@11/bin/clang++"
-		export LD=ld
-		export AR="$HOME/.brew/opt/llvm@11/bin/llvm-ar"
-		export RANLIB="$HOME/.brew/opt/llvm@11/bin/llvm-ranlib"
-	fi
-fi
-

.github/scripts/test.sh

@@ -2,7 +2,6 @@
 
 set -eux
 
-. .github/scripts/prereq.sh
 . .github/scripts/common.sh
 
 
@@ -19,8 +18,10 @@ mkdir -p "${GHCUP_BIN}"
 
 cp "out/${ARTIFACT}"-* "$GHCUP_BIN/ghcup${ext}"
 cp "out/test-${ARTIFACT}"-* "ghcup-test${ext}"
+cp "out/test-optparse-${ARTIFACT}"-* "ghcup-test-optparse${ext}"
 chmod +x "$GHCUP_BIN/ghcup${ext}"
 chmod +x "ghcup-test${ext}"
+chmod +x "ghcup-test-optparse${ext}"
 
 "$GHCUP_BIN/ghcup${ext}" --version
 eghcup --version
@@ -30,7 +31,8 @@ sha_sum "$(raw_eghcup --offline whereis ghcup)"
 ### Haskell test suite
 
 ./ghcup-test${ext}
-rm ghcup-test${ext}
+./ghcup-test-optparse${ext}
+rm ghcup-test${ext} ghcup-test-optparse${ext}
 
 ### manual cli based testing
 
@@ -191,7 +193,7 @@ sha=$(sha_sum "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml")
 # invalidate access time timer, which is 5minutes, so we re-download
 touch -a -m -t '199901010101' "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml"
 # redownload same file with some newlines added
-raw_eghcup -s https://www.haskell.org/ghcup/exp/ghcup-${JSON_VERSION}.yaml list
+raw_eghcup -s https://raw.githubusercontent.com/haskell/ghcup-metadata/exp/ghcup-0.0.7.yaml list
 # snapshot new yaml and etags file
 etag2=$(cat "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml.etags")
 sha2=$(sha_sum "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml")
@@ -201,7 +203,7 @@ sha2=$(sha_sum "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml")
 # invalidate access time timer, which is 5minutes, but don't expect a re-download
 touch -a -m -t '199901010101' "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml"
 # this time, we expect the same hash and etag
-raw_eghcup -s https://www.haskell.org/ghcup/exp/ghcup-${JSON_VERSION}.yaml list
+raw_eghcup -s https://raw.githubusercontent.com/haskell/ghcup-metadata/exp/ghcup-0.0.7.yaml list
 etag3=$(cat "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml.etags")
 sha3=$(sha_sum "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml")
 [ "${etag2}" = "${etag3}" ]

.github/workflows/bootstrap.yaml

@@ -20,13 +20,12 @@ jobs:
       BOOTSTRAP_HASKELL_NONINTERACTIVE: yes
       ARCH: 64
       JSON_VERSION: "0.0.7"
-      APT_GET: "sudo apt-get"
     strategy:
       matrix:
         include:
           - os: ubuntu-latest
             DISTRO: Ubuntu
-          - os: macOS-10.15
+          - os: macOS-11
             DISTRO: na
           - os: windows-latest
             DISTRO: na
@@ -36,7 +35,15 @@ jobs:
         with:
           submodules: 'true'
 
-      - if: runner.os != 'Windows'
+      - if: runner.os == 'Linux'
+        name: Run bootstrap
+        run: |
+          sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl gzip
+          sh ./.github/scripts/bootstrap.sh
+        env:
+          DISTRO: ${{ matrix.DISTRO }}
+
+      - if: runner.os == 'macOS'
         name: Run bootstrap
         run: sh ./.github/scripts/bootstrap.sh
         env:
@@ -44,5 +51,8 @@ jobs:
 
       - if: runner.os == 'Windows'
         name: Run bootstrap
-        run: ./scripts/bootstrap/bootstrap-haskell.ps1 -InstallDir ${GITHUB_WORKSPACE} -BootstrapUrl ${GITHUB_WORKSPACE}/bootstrap-haskell -InBash
+        run: |
+          $curDir = Get-Location
+          Write-Host "Current Working Directory: $curDir"
+          ./scripts/bootstrap/bootstrap-haskell.ps1 -InstallDir ${GITHUB_WORKSPACE} -BootstrapUrl ("{0}/scripts/bootstrap/bootstrap-haskell" -f $curDir) -InBash
         shell: pwsh

.github/workflows/cross.yaml

@@ -0,0 +1,140 @@
+name: Test cross bindists
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - master
+  schedule:
+    - cron: '0 2 * * *'
+
+env:
+  CABAL_CACHE_DISABLE: ${{ vars.CABAL_CACHE_DISABLE }}
+  CABAL_CACHE_NONFATAL: yes
+
+jobs:
+  build:
+    name: Build linux binary
+    runs-on: ubuntu-latest
+    env:
+      CABAL_VER: 3.10.1.0
+      JSON_VERSION: "0.0.7"
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      S3_HOST: ${{ secrets.S3_HOST }}
+      ARTIFACT: "x86_64-linux-ghcup"
+      GHC_VER: 8.10.7
+      ARCH: 64
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+
+      - name: Run build
+        uses: docker://hasufell/alpine-haskell:3.12
+        with:
+          args: sh .github/scripts/build.sh
+        env:
+          ARTIFACT: ${{ env.ARTIFACT }}
+          ARCH: ${{ env.ARCH }}
+          GHC_VER: ${{ env.GHC_VER }}
+          DISTRO: Alpine
+          AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
+          AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
+          S3_HOST: ${{ env.S3_HOST }}
+
+      - if: always()
+        name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: artifacts
+          path: |
+            ./out/*
+
+  test-cross-linux:
+    name: Test linux cross
+    needs: "build"
+    runs-on: [self-hosted, Linux, X64]
+    container:
+      image: registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:8d0224e6b2a08157649651e69302380b2bd24e11
+      options: --user root
+      env:
+        CABAL_VER: 3.6.2.0
+        BUILD_CONF_ARGS: "--enable-unregisterised"
+        HADRIAN_FLAVOUR: ""
+        JSON_VERSION: "0.0.7"
+        GHC_VER: 8.10.6
+        GHC_TARGET_VERSION: "8.10.7"
+        ARCH: 64
+        DISTRO: Debian
+        ARTIFACT: "x86_64-linux-ghcup"
+        CROSS: "arm-linux-gnueabihf"
+        WRAPPER: "run"
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: artifacts
+          path: ./out
+
+      - name: Run test (64 bit linux)
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl gzip
+          sudo apt-get install -y gcc-arm-linux-gnueabihf
+          sudo dpkg --add-architecture armhf
+          sudo apt-get update -y
+          sudo apt-get install -y libncurses-dev:armhf
+          sh .github/scripts/cross.sh
+
+  test-cross-js:
+    name: Test GHC JS cross
+    needs: "build"
+    runs-on: [self-hosted, Linux, X64]
+    container:
+      image: registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:8d0224e6b2a08157649651e69302380b2bd24e11
+      options: --user root
+      env:
+        CABAL_VER: 3.6.2.0
+        BUILD_CONF_ARGS: ""
+        HADRIAN_FLAVOUR: "default+native_bignum"
+        JSON_VERSION: "0.0.7"
+        GHC_VER: 9.6.2
+        GHC_TARGET_VERSION: "9.6.2"
+        ARCH: 64
+        DISTRO: Debian
+        ARTIFACT: "x86_64-linux-ghcup"
+        CROSS: "javascript-unknown-ghcjs"
+        WRAPPER: "emconfigure"
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: artifacts
+          path: ./out
+
+      - name: Run test (64 bit linux)
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl gzip
+          git clone https://github.com/emscripten-core/emsdk.git
+          cd emsdk
+          ./emsdk install latest
+          ./emsdk activate latest
+          . ./emsdk_env.sh
+          cd ..
+          bash .github/scripts/cross.sh
+

.github/workflows/docker.yaml

@@ -6,7 +6,7 @@ on:
     - cron: '0 0 * * *'
 
 jobs:
-  docker-alpine:
+  docker-alpine32:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -26,7 +26,24 @@ jobs:
           context: ./docker/alpine32
           push: true
           tags: hasufell/i386-alpine-haskell:3.12
-          platforms: linux/i386
+          platforms: |
+            linux/i386
+            linux/amd64
+
+  docker-alpine:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push (alpine 64bit)
         uses: docker/build-push-action@v3
         with:
@@ -35,34 +52,74 @@ jobs:
           tags: hasufell/alpine-haskell:3.12
           platforms: linux/amd64
 
-  docker-arm:
-    runs-on: [self-hosted, Linux, aarch64]
+  docker-arm32:
+    runs-on: [self-hosted, Linux, ARM64]
     steps:
       - uses: docker://arm64v8/ubuntu:focal
-        name: Cleanup
+        name: Cleanup (aarch64 linux)
         with:
-          args: rm -rf .ghcup/ cabal/ dist-newstyle/ out/
+          args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
 
       - name: Checkout
         uses: actions/checkout@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
+
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push (arm64v8)
+
+      - name: Build and push (debian buster)
         uses: docker/build-push-action@v3
         with:
-          context: ./docker/arm64v8/
+          context: ./docker/arm32v7/buster
           push: true
-          tags: hasufell/arm64v8-ubuntu-haskell:focal
-          platforms: linux/arm64
-      - name: Build and push (arm32v7)
+          tags: hasufell/arm32v7-debian-haskell:10
+          platforms: linux/arm
+
+      - name: Build and push (ubuntu focal)
         uses: docker/build-push-action@v3
         with:
-          context: ./docker/arm32v7
+          context: ./docker/arm32v7/focal
           push: true
           tags: hasufell/arm32v7-ubuntu-haskell:focal
           platforms: linux/arm
+
+  docker-aarch:
+    runs-on: [self-hosted, Linux, ARM64]
+    steps:
+      - uses: docker://arm64v8/ubuntu:focal
+        name: Cleanup (aarch64 linux)
+        with:
+          args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push (debian buster)
+        uses: docker/build-push-action@v3
+        with:
+          context: ./docker/arm64v8/buster
+          push: true
+          tags: hasufell/arm64v8-debian-haskell:10
+          platforms: linux/arm64
+
+      - name: Build and push (ubuntu focal)
+        uses: docker/build-push-action@v3
+        with:
+          context: ./docker/arm64v8/focal
+          push: true
+          tags: hasufell/arm64v8-ubuntu-haskell:focal
+          platforms: linux/arm64

.github/workflows/release.yaml

@@ -12,12 +12,16 @@ on:
   schedule:
     - cron: '0 2 * * *'
 
+env:
+  CABAL_CACHE_DISABLE: ${{ vars.CABAL_CACHE_DISABLE }}
+  CABAL_CACHE_NONFATAL: yes
+
 jobs:
   build-linux:
     name: Build linux binary
     runs-on: ${{ matrix.os }}
     env:
-      CABAL_VER: 3.6.2.0
+      CABAL_VER: 3.10.1.0
       JSON_VERSION: "0.0.7"
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -81,7 +85,7 @@ jobs:
     name: Build ARM binary
     runs-on: ${{ matrix.os }}
     env:
-      CABAL_VER: 3.6.2.0
+      CABAL_VER: 3.10.1.0
       JSON_VERSION: "0.0.7"
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -90,16 +94,16 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - os: [self-hosted, Linux, aarch64]
+          - os: [self-hosted, Linux, ARM64]
             ARTIFACT: "armv7-linux-ghcup"
             GHC_VER: 9.2.2
             ARCH: ARM
-          - os: [self-hosted, Linux, aarch64]
+          - os: [self-hosted, Linux, ARM64]
             ARTIFACT: "aarch64-linux-ghcup"
-            GHC_VER: 9.2.5
+            GHC_VER: 9.2.6
             ARCH: ARM64
     steps:
-      - uses: docker://arm64v8/ubuntu:focal
+      - uses: docker://arm64v8/debian:10
         name: Cleanup (aarch64 linux)
         with:
           args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
@@ -115,7 +119,7 @@ jobs:
           submodules: 'true'
 
       - if: matrix.ARCH == 'ARM'
-        uses: docker://hasufell/arm32v7-ubuntu-haskell:focal
+        uses: docker://hasufell/arm32v7-debian-haskell:10
         name: Run build (armv7 linux)
         with:
           args: sh .github/scripts/build.sh
@@ -129,7 +133,7 @@ jobs:
           S3_HOST: ${{ env.S3_HOST }}
 
       - if: matrix.ARCH == 'ARM64'
-        uses: docker://hasufell/arm64v8-ubuntu-haskell:focal
+        uses: docker://hasufell/arm64v8-debian-haskell:10
         name: Run build (aarch64 linux)
         with:
           args: sh .github/scripts/build.sh
@@ -154,7 +158,7 @@ jobs:
     name: Build binary (Mac/Win)
     runs-on: ${{ matrix.os }}
     env:
-      CABAL_VER: 3.6.2.0
+      CABAL_VER: 3.10.1.0
       MACOSX_DEPLOYMENT_TARGET: 10.13
       JSON_VERSION: "0.0.7"
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -164,13 +168,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: [self-hosted, macOS, aarch64]
+          - os: [self-hosted, macOS, ARM64]
             ARTIFACT: "aarch64-apple-darwin-ghcup"
-            GHC_VER: 9.2.5
+            GHC_VER: 9.2.6
             ARCH: ARM64
-          - os: macOS-10.15
+          - os: macOS-11
             ARTIFACT: "x86_64-apple-darwin-ghcup"
-            GHC_VER: 9.2.5
+            GHC_VER: 9.2.6
             ARCH: 64
           - os: windows-latest
             ARTIFACT: "x86_64-mingw64-ghcup"
@@ -182,8 +186,48 @@ jobs:
         with:
           submodules: 'true'
 
-      - name: Run build (windows/mac)
-        run: bash .github/scripts/build.sh
+      - if: matrix.ARCH == 'ARM64' && runner.os == 'macOS'
+        name: Run build
+        run: |
+          bash .github/scripts/brew.sh git coreutils llvm@11 autoconf automake
+          export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$HOME/.brew/opt/llvm@11/bin:$PATH"
+          export CC="$HOME/.brew/opt/llvm@11/bin/clang"
+          export CXX="$HOME/.brew/opt/llvm@11/bin/clang++"
+          export LD=ld
+          export AR="$HOME/.brew/opt/llvm@11/bin/llvm-ar"
+          export RANLIB="$HOME/.brew/opt/llvm@11/bin/llvm-ranlib"
+          bash .github/scripts/build.sh
+        env:
+          ARTIFACT: ${{ matrix.ARTIFACT }}
+          ARCH: ${{ matrix.ARCH }}
+          GHC_VER: ${{ matrix.GHC_VER }}
+          DISTRO: na
+          AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
+          AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
+          S3_HOST: ${{ env.S3_HOST }}
+          HOMEBREW_CHANGE_ARCH_TO_ARM: 1
+
+      - if: matrix.ARCH == '64' && runner.os == 'macOS'
+        name: Run build (windows/mac)
+        run: |
+          bash .github/scripts/brew.sh coreutils
+          export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$PATH"
+          bash .github/scripts/build.sh
+        env:
+          ARTIFACT: ${{ matrix.ARTIFACT }}
+          ARCH: ${{ matrix.ARCH }}
+          GHC_VER: ${{ matrix.GHC_VER }}
+          DISTRO: na
+          AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
+          AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
+          S3_HOST: ${{ env.S3_HOST }}
+          HOMEBREW_CHANGE_ARCH_TO_ARM: 1
+
+      - if: runner.os == 'Windows'
+        name: Run build (windows/mac)
+        run: |
+          bash .github/scripts/brew.sh git coreutils autoconf automake
+          bash .github/scripts/build.sh
         env:
           ARTIFACT: ${{ matrix.ARTIFACT }}
           ARCH: ${{ matrix.ARCH }}
@@ -202,13 +246,12 @@ jobs:
           path: |
             ./out/*
 
-
   test-linux:
     name: Test linux
     needs: "build-linux"
     runs-on: ${{ matrix.os }}
     env:
-      CABAL_VER: 3.6.2.0
+      CABAL_VER: 3.10.1.0
       JSON_VERSION: "0.0.7"
     strategy:
       matrix:
@@ -264,13 +307,14 @@ jobs:
 
       - if: matrix.DISTRO != 'Alpine'
         name: Run test (64 bit linux)
-        run: sh .github/scripts/test.sh
+        run: |
+          sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl gzip
+          sh .github/scripts/test.sh
         env:
           ARTIFACT: ${{ matrix.ARTIFACT }}
           ARCH: ${{ matrix.ARCH }}
           GHC_VER: ${{ matrix.GHC_VER }}
           DISTRO: ${{ matrix.DISTRO }}
-          APT_GET: "sudo apt-get"
 
       - if: failure()
         name: Upload artifact
@@ -285,24 +329,24 @@ jobs:
     needs: "build-arm"
     runs-on: ${{ matrix.os }}
     env:
-      CABAL_VER: 3.6.2.0
+      CABAL_VER: 3.10.1.0
       JSON_VERSION: "0.0.7"
     strategy:
       matrix:
         include:
-          - os: [self-hosted, Linux, aarch64]
+          - os: [self-hosted, Linux, ARM64]
             ARTIFACT: "armv7-linux-ghcup"
             GHC_VER: 9.2.2
             ARCH: ARM
             DISTRO: Ubuntu
-          - os: [self-hosted, Linux, aarch64]
+          - os: [self-hosted, Linux, ARM64]
             ARTIFACT: "aarch64-linux-ghcup"
-            GHC_VER: 9.2.5
+            GHC_VER: 9.2.6
             ARCH: ARM64
             DISTRO: Ubuntu
 
     steps:
-      - uses: docker://arm64v8/ubuntu:focal
+      - uses: docker://arm64v8/debian:10
         name: Cleanup (aarch64 linux)
         with:
           args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
@@ -318,7 +362,7 @@ jobs:
           path: ./out
 
       - if: matrix.ARCH == 'ARM'
-        uses: docker://hasufell/arm32v7-ubuntu-haskell:focal
+        uses: docker://hasufell/arm32v7-debian-haskell:10
         name: Run test (armv7 linux)
         with:
           args: sh .github/scripts/test.sh
@@ -329,7 +373,7 @@ jobs:
           DISTRO: Ubuntu
 
       - if: matrix.ARCH == 'ARM64'
-        uses: docker://hasufell/arm64v8-ubuntu-haskell:focal
+        uses: docker://hasufell/arm64v8-debian-haskell:10
         name: Run test (aarch64 linux)
         with:
           args: sh .github/scripts/test.sh
@@ -352,20 +396,20 @@ jobs:
     needs: "build-macwin"
     runs-on: ${{ matrix.os }}
     env:
-      CABAL_VER: 3.6.2.0
+      CABAL_VER: 3.10.1.0
       MACOSX_DEPLOYMENT_TARGET: 10.13
       JSON_VERSION: "0.0.7"
     strategy:
       matrix:
         include:
-          - os: [self-hosted, macOS, aarch64]
+          - os: [self-hosted, macOS, ARM64]
             ARTIFACT: "aarch64-apple-darwin-ghcup"
-            GHC_VER: 9.2.5
+            GHC_VER: 9.2.6
             ARCH: ARM64
             DISTRO: na
-          - os: macOS-10.15
+          - os: macOS-11
             ARTIFACT: "x86_64-apple-darwin-ghcup"
-            GHC_VER: 9.2.5
+            GHC_VER: 9.2.6
             ARCH: 64
             DISTRO: na
           - os: windows-latest
@@ -385,7 +429,21 @@ jobs:
           name: artifacts
           path: ./out
 
-      - name: Run test (windows/mac)
+      - if: runner.os == 'macOS'
+        name: Run test
+        run: |
+          bash .github/scripts/brew.sh coreutils
+          export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$PATH"
+          bash .github/scripts/test.sh
+        env:
+          ARTIFACT: ${{ matrix.ARTIFACT }}
+          ARCH: ${{ matrix.ARCH }}
+          GHC_VER: ${{ matrix.GHC_VER }}
+          DISTRO: ${{ matrix.DISTRO }}
+          HOMEBREW_CHANGE_ARCH_TO_ARM: 1
+
+      - if: runner.os != 'macOS'
+        name: Run test
         run: bash .github/scripts/test.sh
         env:
           ARTIFACT: ${{ matrix.ARTIFACT }}
@@ -416,7 +474,7 @@ jobs:
     env:
       GHC_VERSION: "8.10.7"
       HLS_TARGET_VERSION: "1.8.0.0"
-      CABAL_VERSION: "3.6.2.0"
+      CABAL_VERSION: "3.8.1.0"
       JSON_VERSION: "0.0.7"
       ARTIFACT: "x86_64-linux-ghcup"
       DISTRO: Ubuntu
@@ -436,9 +494,9 @@ jobs:
           path: ./out
 
       - name: Run hls build
-        run: sh .github/scripts/hls.sh
-        env:
-          APT_GET: "sudo apt-get"
+        run: |
+          sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl gzip
+          sh .github/scripts/hls.sh
 
   release:
     name: release

.travis.yml

@@ -1,25 +0,0 @@
-jobs:
-  include:
-    - os: osx
-      osx_image: xcode10.1
-      language: generic
-      env: ARTIFACT=x86_64-apple-darwin-10.13-ghcup
-
-    - os: osx
-      osx_image: xcode11.3
-      language: generic
-      env: ARTIFACT=x86_64-apple-darwin-10.14-ghcup
-
-
-script: ".travis/build.sh"
-
-deploy:
-  provider: releases
-  api_key:
-    secure: "hT2od8Iy04tdFVuonPSWv0NX5hZDmv4al8Q0GbIWmviUetROuM7c6/MCHUcgyiw6H2L3pmH4F24GBYWpKBT3ZMbxrKXhZOZ3KPLXzlnuRlm1qymKqqwsJs3466bMftaiBr16rx1VpAuditN4A32oSmTFcQAJc84Bxn2WZ4t8hk9muS8YPyLhqg3/NxT6ob8dzNp9eS2cA0WODMb/fMzaMruRtepSK8JvuXb/SnTvaDcl9plmPzEa+eW54jwVsDps8ZpQMQlTtGIjYHIwTQ36/iLH4LoAvD7OEnB7qf753LOzmI/bvlB75xYGsLxe1qgpzPMjuG3AK0jb2KGSZCzyAyrbBFSQMIyC1gNKMtab3CohnA9WdQqAT1xrzPzA9zNw516G5Fn/z+t9Ek1f6L2OYO2hJfweNhWh+ChAIsOags2QBpqc0qjkwUS4wqxCWBdyVfgPTUoGelvjCfjQgypgIyLEHFvXt9rlj+kd97FY7nG3vxZrsvWTKKKT551OqUYX5zWTyvGR71jKyNst/p93Pg3DkRy31gHrGnG9zfNgN5tWxJqDd/suR/BAFTp0VtkFb8fR3ct7WMVeJXtE2+bKqxO5Fnocs1VjEm8pKPk7glnp0muu08kaO0h54wiSOCbk1RvO1KZtHue4wKWrHcI18dwW2WtzoBQ4P1lOSkS81UY="
-  file: $ARTIFACT
-  on:
-    repo: hasufell/ghcup-hs
-    tags: true
-  skip_cleanup: true
-  draft: true

CHANGELOG.md

@@ -1,5 +1,54 @@
 # Revision history for ghcup
 
+## 0.1.19.5 -- ????-?-??
+
+* support JS cross compilers wrt [#838](https://github.com/haskell/ghcup-hs/issues/838)
+
+## 0.1.19.4 -- 2023-7-02
+
+* fix missing TUI for aarch64 linux binaries
+
+## 0.1.19.3 -- 2023-6-29
+
+* Implement support for nightlies, wrt [#824](https://github.com/haskell/ghcup-hs/issues/824)
+* Fix GC with XDG dirs, fixes [#810](https://github.com/haskell/ghcup-hs/issues/810)
+
+## 0.1.19.2 -- 2023-2-24
+
+* Follow-up fix for JFS/ReiserFS and other filesystem that don't support `d_type`, fixes [#787](https://github.com/haskell/ghcup-hs/issues/787)
+    - the previous release had a bug that invalidated that broke it
+* Implement 'latest-prerelease' tag wrt [#788](https://github.com/haskell/ghcup-hs/issues/788)
+* Fix 'Could not parse version of stray directory.DS_Store' warnings on macOs wrt [#797](https://github.com/haskell/ghcup-hs/issues/797)
+
+## 0.1.19.1 -- 2023-2-19
+
+* Fix GHCup on JFS/ReiserFS and other filesystem that don't support `d_type`, fixes [#766](https://github.com/haskell/ghcup-hs/issues/766)
+* Don't fail on setModificationTime, fixes [#784](https://github.com/haskell/ghcup-hs/issues/784) and many GitHub actions issues
+* Make armv7/aarch64 linux binaries more portable (built on Debian buster)
+* Improve usability on 'ghcup config add-release-channel', fixes [#751](https://github.com/haskell/ghcup-hs/issues/751)
+* Make version shortcuts work with 'ghcup set', fixes [#757](https://github.com/haskell/ghcup-hs/issues/757)
+* Don't implicitly smuggle in config options in `ghcup config set` wrt [#775](https://github.com/haskell/ghcup-hs/issues/775)
+* Fix build on unix with -ftui
+
+## 0.1.19.0 -- 2023-1-13
+
+* restore proper support for FreeBSD and Linux armv7
+* integrate with [errors.haskell.org](https://errors.haskell.org/index.html), wrt [#434](https://github.com/haskell/ghcup-hs/issues/434)
+* allow to overwrite distro detection via config wrt [#421](https://github.com/haskell/ghcup-hs/issues/421)
+    - this is particularly useful for e.g. Ubuntu derivates, where ghcup doesn't pick the optimal bindist, also see the [GHCup documentation on overriding distro detection](https://www.haskell.org/ghcup/guide/#overriding-distro-detection)
+* Add proper support for mirrors wrt [#357](https://github.com/haskell/ghcup-hs/issues/357)
+* fix a (harmless) bug in `ghcup nuke` on windows
+* improvements to `ghcup add-release-channel` wrt [#708](https://github.com/haskell/ghcup-hs/issues/708)
+* fix building newer GHC from source wrt [#433](https://github.com/haskell/ghcup-hs/issues/433)
+* Fix `ghcup install hls -u` on windows
+* Fix failure with `--isolate=dir --force`
+* Add `--metadata-fetching-mode` arg, fixes [#440](https://github.com/haskell/ghcup-hs/issues/440)
+* Add content-length property to downloads
+* [Fix a grave bug on armv7](https://github.com/haskell/ghcup-hs/commit/78ee956df2618862f421178a565c82548ff7e578) during installation wrt [#415](https://github.com/haskell/ghcup-hs/issues/415)
+* improve many warning/error messages (contributions by @taylorfausak)
+* some minor optimization in `ghcup whereis ghcup`
+* improve `--keep=always` to not clean up directories in certain circumstances
+
 ## 0.1.18.1 -- 2022-08-06
 
 * fix sdist and unbreak hackage, wrt [#399](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/399)

app/ghcup/BrickMain.hs

@@ -4,6 +4,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TypeApplications  #-}
 {-# LANGUAGE RankNTypes        #-}
+{-# LANGUAGE ViewPatterns      #-}
 
 module BrickMain where
 
@@ -72,8 +73,8 @@ data BrickData = BrickData
   deriving Show
 
 data BrickSettings = BrickSettings
-  { showAllVersions :: Bool
-  , showAllTools    :: Bool
+  { showAllVersions    :: Bool
+  , showAllTools       :: Bool
   }
   deriving Show
 
@@ -154,8 +155,11 @@ ui dimAttrs BrickState{ appSettings = as@BrickSettings{}, ..}
       <+> minHSize 15 (str "Version")
       <+> padLeft (Pad 1) (minHSize 25 $ str "Tags")
       <+> padLeft (Pad 5) (str "Notes")
-  renderList' = withDefAttr listAttr . drawListElements renderItem True
-  renderItem _ b listResult@ListResult{..} =
+  renderList' bis@BrickInternalState{..} =
+    let minTagSize = V.maximum $ V.map (length . intercalate "," . fmap tagToString . lTag) clr
+        minVerSize = V.maximum $ V.map (\ListResult{..} -> T.length $ tVerToText (GHCTargetVersion lCross lVer)) clr
+    in withDefAttr listAttr . drawListElements (renderItem minTagSize minVerSize) True $ bis
+  renderItem minTagSize minVerSize _ b listResult@ListResult{lTag = lTag', ..} =
     let marks = if
           | lSet       -> (withAttr (attrName "set") $ str "✔✔")
           | lInstalled -> (withAttr (attrName "installed") $ str "✓ ")
@@ -170,7 +174,7 @@ ui dimAttrs BrickState{ appSettings = as@BrickSettings{}, ..}
           = updateAttrMap (const dimAttrs) . withAttr (attrName "no-bindist")
           | otherwise  = id
         hooray
-          | elem Latest lTag && not lInstalled =
+          | elem Latest lTag' && not lInstalled =
               withAttr (attrName "hooray")
           | otherwise = id
         active = if b then putCursor "GHCup" (Location (0,0)) . forceAttr (attrName "active") else id
@@ -180,9 +184,9 @@ ui dimAttrs BrickState{ appSettings = as@BrickSettings{}, ..}
                ( minHSize 6
                  (printTool lTool)
                )
-          <+> minHSize 15 (str ver)
-          <+> (let l = catMaybes . fmap printTag $ sort lTag
-               in  padLeft (Pad 1) $ minHSize 25 $ if null l
+          <+> minHSize minVerSize (str ver)
+          <+> (let l = catMaybes . fmap printTag $ sort lTag'
+               in  padLeft (Pad 1) $ minHSize minTagSize $ if null l
                      then emptyWidget
                      else foldr1 (\x y -> x <+> str "," <+> y) l
               )
@@ -198,8 +202,11 @@ ui dimAttrs BrickState{ appSettings = as@BrickSettings{}, ..}
   printTag Recommended    = Just $ withAttr (attrName "recommended") $ str "recommended"
   printTag Latest         = Just $ withAttr (attrName "latest") $ str "latest"
   printTag Prerelease     = Just $ withAttr (attrName "prerelease") $ str "prerelease"
+  printTag Nightly        = Just $ withAttr (attrName "nightly") $ str "nightly"
   printTag (Base pvp'')   = Just $ str ("base-" ++ T.unpack (prettyPVP pvp''))
   printTag Old            = Nothing
+  printTag LatestPrerelease = Just $ withAttr (attrName "latest-prerelease") $ str "latest-prerelease"
+  printTag LatestNightly    = Just $ withAttr (attrName "latest-nightly") $ str "latest-nightly"
   printTag (UnknownTag t) = Just $ str t
 
   printTool Cabal = str "cabal"
@@ -211,8 +218,10 @@ ui dimAttrs BrickState{ appSettings = as@BrickSettings{}, ..}
   printNotes ListResult {..} =
     (if hlsPowered then [withAttr (attrName "hls-powered") $ str "hls-powered"] else mempty
       )
-      ++ (if fromSrc then [withAttr (attrName "compiled") $ str "compiled"] else mempty)
       ++ (if lStray then [withAttr (attrName "stray") $ str "stray"] else mempty)
+      ++ (case lReleaseDay of
+            Nothing -> mempty
+            Just d  -> [withAttr (attrName "day") $ str (show d)])
 
   -- | Draws the list elements.
   --
@@ -267,18 +276,22 @@ app attrs dimAttrs =
 defaultAttributes :: Bool -> AttrMap
 defaultAttributes no_color = attrMap
   Vty.defAttr
-  [ (attrName "active"       , Vty.defAttr `withBackColor` Vty.blue)
-  , (attrName "not-installed", Vty.defAttr `withForeColor` Vty.red)
-  , (attrName "set"          , Vty.defAttr `withForeColor` Vty.green)
-  , (attrName "installed"    , Vty.defAttr `withForeColor` Vty.green)
-  , (attrName "recommended"  , Vty.defAttr `withForeColor` Vty.green)
-  , (attrName "hls-powered"  , Vty.defAttr `withForeColor` Vty.green)
-  , (attrName "latest"       , Vty.defAttr `withForeColor` Vty.yellow)
-  , (attrName "prerelease"   , Vty.defAttr `withForeColor` Vty.red)
-  , (attrName "compiled"     , Vty.defAttr `withForeColor` Vty.blue)
-  , (attrName "stray"        , Vty.defAttr `withForeColor` Vty.blue)
-  , (attrName "help"         , Vty.defAttr `withStyle`     Vty.italic)
-  , (attrName "hooray"       , Vty.defAttr `withForeColor` Vty.brightWhite)
+  [ (attrName "active"            , Vty.defAttr `withBackColor` Vty.blue)
+  , (attrName "not-installed"     , Vty.defAttr `withForeColor` Vty.red)
+  , (attrName "set"               , Vty.defAttr `withForeColor` Vty.green)
+  , (attrName "installed"         , Vty.defAttr `withForeColor` Vty.green)
+  , (attrName "recommended"       , Vty.defAttr `withForeColor` Vty.green)
+  , (attrName "hls-powered"       , Vty.defAttr `withForeColor` Vty.green)
+  , (attrName "latest"            , Vty.defAttr `withForeColor` Vty.yellow)
+  , (attrName "latest-prerelease" , Vty.defAttr `withForeColor` Vty.red)
+  , (attrName "latest-nightly"    , Vty.defAttr `withForeColor` Vty.red)
+  , (attrName "prerelease"        , Vty.defAttr `withForeColor` Vty.red)
+  , (attrName "nightly"           , Vty.defAttr `withForeColor` Vty.red)
+  , (attrName "compiled"          , Vty.defAttr `withForeColor` Vty.blue)
+  , (attrName "stray"             , Vty.defAttr `withForeColor` Vty.blue)
+  , (attrName "day"               , Vty.defAttr `withForeColor` Vty.blue)
+  , (attrName "help"              , Vty.defAttr `withStyle`     Vty.italic)
+  , (attrName "hooray"            , Vty.defAttr `withForeColor` Vty.brightWhite)
   ]
   where
     withForeColor | no_color  = const
@@ -405,13 +418,17 @@ filterVisible :: Bool -> Bool -> ListResult -> Bool
 filterVisible v t e | lInstalled e = True
                     | v
                     , not t
+                    , Nightly `notElem` lTag e
                     , lTool e `notElem` hiddenTools = True
                     | not v
                     , t
-                    , Old `notElem` lTag e = True
+                    , Old `notElem` lTag e
+                    , Nightly `notElem` lTag e = True
                     | v
+                    , Nightly `notElem` lTag e
                     , t = True
-                    | otherwise = (Old `notElem` lTag e) &&
+                    | otherwise = (Old `notElem` lTag e)       &&
+                                  (Nightly `notElem` lTag e)   &&
                                   (lTool e `notElem` hiddenTools)
 
 
@@ -454,19 +471,19 @@ install' _ (_, ListResult {..}) = do
       dirs <- lift getDirs
       case lTool of
         GHC   -> do
-          let vi = getVersionInfo lVer GHC dls
-          liftE $ installGHCBin lVer GHCupInternal False [] $> (vi, dirs, ce)
+          let vi = getVersionInfo (GHCTargetVersion lCross lVer) GHC dls
+          liftE $ installGHCBin (GHCTargetVersion lCross lVer) GHCupInternal False [] $> (vi, dirs, ce)
         Cabal -> do
-          let vi = getVersionInfo lVer Cabal dls
+          let vi = getVersionInfo (GHCTargetVersion lCross lVer) Cabal dls
           liftE $ installCabalBin lVer GHCupInternal False $> (vi, dirs, ce)
         GHCup -> do
           let vi = snd <$> getLatest dls GHCup
           liftE $ upgradeGHCup Nothing False False $> (vi, dirs, ce)
         HLS   -> do
-          let vi = getVersionInfo lVer HLS dls
+          let vi = getVersionInfo (GHCTargetVersion lCross lVer) HLS dls
           liftE $ installHLSBin lVer GHCupInternal False $> (vi, dirs, ce)
         Stack -> do
-          let vi = getVersionInfo lVer Stack dls
+          let vi = getVersionInfo (GHCTargetVersion lCross lVer) Stack dls
           liftE $ installStackBin lVer GHCupInternal False $> (vi, dirs, ce)
     )
     >>= \case
@@ -547,7 +564,7 @@ del' _ (_, ListResult {..}) = do
   let run = runE @'[NotInstalled, UninstallFailed]
 
   run (do
-      let vi = getVersionInfo lVer lTool dls
+      let vi = getVersionInfo (GHCTargetVersion lCross lVer) lTool dls
       case lTool of
         GHC   -> liftE $ rmGHCVer (GHCTargetVersion lCross lVer) $> vi
         Cabal -> liftE $ rmCabalVer lVer $> vi
@@ -557,7 +574,7 @@ del' _ (_, ListResult {..}) = do
     )
     >>= \case
           VRight vi -> do
-            logGHCPostRm (mkTVer lVer)
+            when (lTool == GHC) $ logGHCPostRm (mkTVer lVer)
             forM_ (_viPostRemove =<< vi) $ \msg ->
               logInfo msg
             pure $ Right ()
@@ -570,7 +587,7 @@ changelog' :: (MonadReader AppState m, MonadIO m)
            -> m (Either String ())
 changelog' _ (_, ListResult {..}) = do
   AppState { pfreq, ghcupInfo = GHCupInfo { _ghcupDownloads = dls }} <- ask
-  case getChangeLog dls lTool (Left lVer) of
+  case getChangeLog dls lTool (ToolVersion lVer) of
     Nothing -> pure $ Left $
       "Could not find ChangeLog for " <> prettyShow lTool <> ", version " <> T.unpack (prettyVer lVer)
     Just uri -> do
@@ -650,5 +667,5 @@ getAppData mgi = runExceptT $ do
   settings <- liftIO $ readIORef settings'
 
   flip runReaderT settings $ do
-    lV <- listVersions Nothing Nothing
+    lV <- listVersions Nothing [] False True (Nothing, Nothing)
     pure $ BrickData (reverse lV)

app/ghcup/GHCup/OptParse.hs

@@ -244,7 +244,8 @@ com =
       <> command
            "list"
            (info (List <$> listOpts <**> helper)
-                 (progDesc "Show available GHCs and other tools")
+                 (progDesc "Show available GHCs and other tools"
+                 <> footerDoc (Just $ text listToolFooter))
            )
       <> command
            "upgrade"

app/ghcup/GHCup/OptParse/ChangeLog.hs

@@ -35,7 +35,6 @@ import qualified Data.Text                     as T
 import Control.Exception.Safe (MonadMask)
 import GHCup.Types.Optics
 import GHCup.Utils
-import Data.Versions
 import URI.ByteString (serializeURIRef')
 import Data.Char (toLower)
 
@@ -50,7 +49,7 @@ data ChangeLogOptions = ChangeLogOptions
   { clOpen    :: Bool
   , clTool    :: Maybe Tool
   , clToolVer :: Maybe ToolVersion
-  }
+  } deriving (Eq, Show)
 
 
 
@@ -76,12 +75,12 @@ changelogP =
                 e       -> Left e
               )
             )
-            (short 't' <> long "tool" <> metavar "<ghc|cabal|hls|ghcup>" <> help
+            (short 't' <> long "tool" <> metavar "<ghc|cabal|hls|ghcup|stack>" <> help
               "Open changelog for given tool (default: ghc)"
               <> completer toolCompleter
             )
           )
-    <*> optional (toolVersionTagArgument Nothing Nothing)
+    <*> optional (toolVersionTagArgument [] Nothing)
 
 
 
@@ -115,20 +114,15 @@ changelog :: ( Monad m
 changelog ChangeLogOptions{..} runAppState runLogger = do
   GHCupInfo { _ghcupDownloads = dls } <- runAppState getGHCupInfo
   let tool = fromMaybe GHC clTool
-      ver' = maybe
-        (Right Latest)
-        (\case
-          GHCVersion tv  -> Left (_tvVersion tv)
-          ToolVersion tv -> Left tv
-          ToolTag     t  -> Right t
-        )
+      ver' = fromMaybe
+        (ToolTag Latest)
         clToolVer
       muri = getChangeLog dls tool ver'
   case muri of
     Nothing -> do
       runLogger
         (logWarn $
-          "Could not find ChangeLog for " <> T.pack (prettyShow tool) <> ", version " <> either prettyVer (T.pack . show) ver'
+          "Could not find ChangeLog for " <> T.pack (prettyShow tool) <> ", version " <> T.pack (prettyShow ver')
         )
       pure ExitSuccess
     Just uri -> do

app/ghcup/GHCup/OptParse/Common.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE NumericUnderscores #-}
+{-# LANGUAGE ViewPatterns      #-}
 
 module GHCup.OptParse.Common where
 
@@ -45,6 +46,8 @@ import           Data.Functor
 import           Data.List                      ( nub, sort, sortBy, isPrefixOf, stripPrefix )
 import           Data.Maybe
 import           Data.Text                      ( Text )
+import           Data.Time.Calendar             ( Day )
+import           Data.Time.Format               ( parseTimeM, defaultTimeLocale )
 import           Data.Versions           hiding ( str )
 import           Data.Void
 import qualified Data.Vector      as V
@@ -72,26 +75,27 @@ import qualified Cabal.Config            as CC
     --[ Types ]--
     -------------
 
-data ToolVersion = GHCVersion GHCTargetVersion
-                 | ToolVersion Version
-                 | ToolTag Tag
 
 -- a superset of ToolVersion
 data SetToolVersion = SetGHCVersion GHCTargetVersion
                     | SetToolVersion Version
                     | SetToolTag Tag
+                    | SetToolDay Day
                     | SetRecommended
                     | SetNext
+                    deriving (Eq, Show)
 
 prettyToolVer :: ToolVersion -> String
-prettyToolVer (GHCVersion v') = T.unpack $ tVerToText v'
+prettyToolVer (GHCVersion v')  = T.unpack $ tVerToText v'
 prettyToolVer (ToolVersion v') = T.unpack $ prettyVer v'
-prettyToolVer (ToolTag t) = show t
+prettyToolVer (ToolTag t)      = show t
+prettyToolVer (ToolDay day)    = show day
 
 toSetToolVer :: Maybe ToolVersion -> SetToolVersion
 toSetToolVer (Just (GHCVersion v')) = SetGHCVersion v'
 toSetToolVer (Just (ToolVersion v')) = SetToolVersion v'
 toSetToolVer (Just (ToolTag t')) = SetToolTag t'
+toSetToolVer (Just (ToolDay d')) = SetToolDay d'
 toSetToolVer Nothing = SetRecommended
 
 
@@ -102,28 +106,28 @@ toSetToolVer Nothing = SetRecommended
     --------------
 
 
-toolVersionTagArgument :: Maybe ListCriteria -> Maybe Tool -> Parser ToolVersion
+toolVersionTagArgument :: [ListCriteria] -> Maybe Tool -> Parser ToolVersion
 toolVersionTagArgument criteria tool =
   argument (eitherReader (parser tool))
     (metavar (mv tool)
     <> completer (tagCompleter (fromMaybe GHC tool) [])
     <> foldMap (completer . versionCompleter criteria) tool)
  where
-  mv (Just GHC) = "GHC_VERSION|TAG"
-  mv (Just HLS) = "HLS_VERSION|TAG"
-  mv _          = "VERSION|TAG"
+  mv (Just GHC) = "GHC_VERSION|TAG|RELEASE_DATE"
+  mv (Just HLS) = "HLS_VERSION|TAG|RELEASE_DATE"
+  mv _          = "VERSION|TAG|RELEASE_DATE"
 
   parser (Just GHC) = ghcVersionTagEither
   parser Nothing    = ghcVersionTagEither
   parser _          = toolVersionTagEither
 
 
-versionParser' :: Maybe ListCriteria -> Maybe Tool -> Parser Version
+versionParser' :: [ListCriteria] -> Maybe Tool -> Parser Version
 versionParser' criteria tool = argument
   (eitherReader (first show . version . T.pack))
   (metavar "VERSION"  <> foldMap (completer . versionCompleter criteria) tool)
 
-ghcVersionArgument :: Maybe ListCriteria -> Maybe Tool -> Parser GHCTargetVersion
+ghcVersionArgument :: [ListCriteria] -> Maybe Tool -> Parser GHCTargetVersion
 ghcVersionArgument criteria tool = argument (eitherReader ghcVersionEither)
                                             (metavar "VERSION" <> foldMap (completer . versionCompleter criteria) tool)
 
@@ -237,21 +241,23 @@ isolateParser f = case isValid f && isAbsolute f of
 -- this accepts cross prefix
 ghcVersionTagEither :: String -> Either String ToolVersion
 ghcVersionTagEither s' =
-  second ToolTag (tagEither s') <|> second GHCVersion (ghcVersionEither s')
+  second ToolDay (dayParser s') <|> second ToolTag (tagEither s') <|> second GHCVersion (ghcVersionEither s')
 
 -- this ignores cross prefix
 toolVersionTagEither :: String -> Either String ToolVersion
 toolVersionTagEither s' =
-  second ToolTag (tagEither s') <|> second ToolVersion (toolVersionEither s')
+  second ToolDay (dayParser s') <|> second ToolTag (tagEither s') <|> second ToolVersion (toolVersionEither s')
 
 tagEither :: String -> Either String Tag
 tagEither s' = case fmap toLower s' of
-  "recommended" -> Right Recommended
-  "latest"      -> Right Latest
+  "recommended"              -> Right Recommended
+  "latest"                   -> Right Latest
+  "latest-prerelease"        -> Right LatestPrerelease
+  "latest-nightly"           -> Right LatestNightly
   ('b':'a':'s':'e':'-':ver') -> case pvp (T.pack ver') of
                                   Right x -> Right (Base x)
                                   Left  _ -> Left $ "Invalid PVP version for base " <> ver'
-  other         -> Left $ "Unknown tag " <> other
+  other                      -> Left $ "Unknown tag " <> other
 
 
 ghcVersionEither :: String -> Either String GHCTargetVersion
@@ -260,7 +266,7 @@ ghcVersionEither =
 
 toolVersionEither :: String -> Either String Version
 toolVersionEither =
-  first (const "Not a valid version") . MP.parse version' "" . T.pack
+  first (const "Not a valid version") . MP.parse (version' <* MP.eof) "" . T.pack
 
 
 toolParser :: String -> Either String Tool
@@ -271,12 +277,22 @@ toolParser s' | t == T.pack "ghc"   = Right GHC
               | otherwise           = Left ("Unknown tool: " <> s')
   where t = T.toLower (T.pack s')
 
+dayParser :: String -> Either String Day
+dayParser s = maybe (Left $ "Could not parse \"" <> s <> "\". Expected format is: YYYY-MM-DD") Right
+            $ parseTimeM True defaultTimeLocale "%Y-%-m-%-d" s
+
 
 criteriaParser :: String -> Either String ListCriteria
-criteriaParser s' | t == T.pack "installed" = Right ListInstalled
-                  | t == T.pack "set"       = Right ListSet
-                  | t == T.pack "available" = Right ListAvailable
-                  | otherwise               = Left ("Unknown criteria: " <> s')
+criteriaParser s' | t == T.pack "installed"   = Right $ ListInstalled True
+                  | t == T.pack "set"         = Right $ ListSet True
+                  | t == T.pack "available"   = Right $ ListAvailable True
+                  | t == T.pack "+installed"  = Right $ ListInstalled True
+                  | t == T.pack "+set"        = Right $ ListSet True
+                  | t == T.pack "+available"  = Right $ ListAvailable True
+                  | t == T.pack "-installed"  = Right $ ListInstalled False
+                  | t == T.pack "-set"        = Right $ ListSet False
+                  | t == T.pack "-available"  = Right $ ListAvailable False
+                  | otherwise                 = Left ("Unknown criteria: " <> s')
   where t = T.toLower (T.pack s')
 
 
@@ -452,12 +468,12 @@ tagCompleter tool add = listIOCompleter $ do
       let allTags = filter (/= Old)
             $ _viTags =<< M.elems (availableToolVersions (_ghcupDownloads ghcupInfo) tool)
       pure $ nub $ (add ++) $ fmap tagToString allTags
-    VLeft _ -> pure  (nub $ ["recommended", "latest"] ++ add)
+    VLeft _ -> pure  (nub $ ["recommended", "latest", "latest-prerelease"] ++ add)
 
-versionCompleter :: Maybe ListCriteria -> Tool -> Completer
+versionCompleter :: [ListCriteria] -> Tool -> Completer
 versionCompleter criteria tool = versionCompleter' criteria tool (const True)
 
-versionCompleter' :: Maybe ListCriteria -> Tool -> (Version -> Bool) -> Completer
+versionCompleter' :: [ListCriteria] -> Tool -> (Version -> Bool) -> Completer
 versionCompleter' criteria tool filter' = listIOCompleter $ do
   dirs' <- liftIO getAllDirs
   let loggerConfig = LoggerConfig
@@ -486,7 +502,7 @@ versionCompleter' criteria tool filter' = listIOCompleter $ do
 
           runEnv = flip runReaderT appState
 
-      installedVersions <- runEnv $ listVersions (Just tool) criteria
+      installedVersions <- runEnv $ listVersions (Just tool) criteria False False (Nothing, Nothing)
       return $ fmap (T.unpack . prettyVer) . filter filter' . fmap lVer $ installedVersions
 
 
@@ -654,6 +670,7 @@ fromVersion :: ( HasLog env
             -> Tool
             -> Excepts
                  '[ TagNotFound
+                  , DayNotFound
                   , NextVerNotFound
                   , NoToolVersionSet
                   ] m (GHCTargetVersion, Maybe VersionInfo)
@@ -672,46 +689,58 @@ fromVersion' :: ( HasLog env
              -> Tool
              -> Excepts
                   '[ TagNotFound
+                   , DayNotFound
                    , NextVerNotFound
                    , NoToolVersionSet
                    ] m (GHCTargetVersion, Maybe VersionInfo)
 fromVersion' SetRecommended tool = do
   GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-  bimap mkTVer Just <$> getRecommended dls tool
+  second Just <$> getRecommended dls tool
     ?? TagNotFound Recommended tool
 fromVersion' (SetGHCVersion v) tool = do
   GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-  let vi = getVersionInfo (_tvVersion v) tool dls
+  let vi = getVersionInfo v tool dls
   case pvp $ prettyVer (_tvVersion v) of -- need to be strict here
     Left _ -> pure (v, vi)
     Right pvpIn ->
-      lift (getLatestToolFor tool pvpIn dls) >>= \case
-        Just (pvp_, vi') -> do
+      lift (getLatestToolFor tool (_tvTarget v) pvpIn dls) >>= \case
+        Just (pvp_, vi', mt) -> do
           v' <- lift $ pvpToVersion pvp_ ""
           when (v' /= _tvVersion v) $ lift $ logWarn ("Assuming you meant version " <> prettyVer v')
-          pure (GHCTargetVersion (_tvTarget v) v', Just vi')
+          pure (GHCTargetVersion mt v', Just vi')
         Nothing -> pure (v, vi)
-fromVersion' (SetToolVersion v) tool = do
+fromVersion' (SetToolVersion (mkTVer -> v)) tool = do
   GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
   let vi = getVersionInfo v tool dls
-  case pvp $ prettyVer v of -- need to be strict here
-    Left _ -> pure (mkTVer v, vi)
+  case pvp $ prettyVer (_tvVersion v) of -- need to be strict here
+    Left _ -> pure (v, vi)
     Right pvpIn ->
-      lift (getLatestToolFor tool pvpIn dls) >>= \case
-        Just (pvp_, vi') -> do
+      lift (getLatestToolFor tool (_tvTarget v) pvpIn dls) >>= \case
+        Just (pvp_, vi', mt) -> do
           v' <- lift $ pvpToVersion pvp_ ""
-          when (v' /= v) $ lift $ logWarn ("Assuming you meant version " <> prettyVer v')
-          pure (GHCTargetVersion mempty v', Just vi')
-        Nothing -> pure (mkTVer v, vi)
+          when (v' /= _tvVersion v) $ lift $ logWarn ("Assuming you meant version " <> prettyVer v')
+          pure (GHCTargetVersion mt v', Just vi')
+        Nothing -> pure (v, vi)
 fromVersion' (SetToolTag Latest) tool = do
   GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-  bimap mkTVer Just <$> getLatest dls tool ?? TagNotFound Latest tool
+  bimap id Just <$> getLatest dls tool ?? TagNotFound Latest tool
+fromVersion' (SetToolDay day) tool = do
+  GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
+  bimap id Just <$> case getByReleaseDay dls tool day of
+                          Left ad -> throwE $ DayNotFound day tool ad
+                          Right v -> pure v
+fromVersion' (SetToolTag LatestPrerelease) tool = do
+  GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
+  bimap id Just <$> getLatestPrerelease dls tool ?? TagNotFound LatestPrerelease tool
+fromVersion' (SetToolTag LatestNightly) tool = do
+  GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
+  bimap id Just <$> getLatestNightly dls tool ?? TagNotFound LatestNightly tool
 fromVersion' (SetToolTag Recommended) tool = do
   GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-  bimap mkTVer Just <$> getRecommended dls tool ?? TagNotFound Recommended tool
+  bimap id Just <$> getRecommended dls tool ?? TagNotFound Recommended tool
 fromVersion' (SetToolTag (Base pvp'')) GHC = do
   GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-  bimap mkTVer Just <$> getLatestBaseVersion dls pvp'' ?? TagNotFound (Base pvp'') GHC
+  bimap id Just <$> getLatestBaseVersion dls pvp'' ?? TagNotFound (Base pvp'') GHC
 fromVersion' SetNext tool = do
   GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
   next <- case tool of
@@ -756,7 +785,7 @@ fromVersion' SetNext tool = do
         . sort
         $ stacks) ?? NoToolVersionSet tool
     GHCup -> fail "GHCup cannot be set"
-  let vi = getVersionInfo (_tvVersion next) tool dls
+  let vi = getVersionInfo next tool dls
   pure (next, vi)
 fromVersion' (SetToolTag t') tool =
   throwE $ TagNotFound t' tool
@@ -772,15 +801,15 @@ checkForUpdates :: ( MonadReader env m
                    , MonadIO m
                    , MonadFail m
                    )
-                => m [(Tool, Version)]
+                => m [(Tool, GHCTargetVersion)]
 checkForUpdates = do
   GHCupInfo { _ghcupDownloads = dls } <- getGHCupInfo
-  lInstalled <- listVersions Nothing (Just ListInstalled)
-  let latestInstalled tool = (fmap lVer . lastMay . filter (\lr -> lTool lr == tool)) lInstalled
+  lInstalled <- listVersions Nothing [ListInstalled True] False False (Nothing, Nothing)
+  let latestInstalled tool = (fmap (\lr -> GHCTargetVersion (lCross lr) (lVer lr)) . lastMay . filter (\lr -> lTool lr == tool)) lInstalled
 
-  ghcup <- forMM (getLatest dls GHCup) $ \(l, _) -> do
+  ghcup <- forMM (getLatest dls GHCup) $ \(GHCTargetVersion _ l, _) -> do
     (Right ghcup_ver) <- pure $ version $ prettyPVP ghcUpVer
-    if (l > ghcup_ver) then pure $ Just (GHCup, l) else pure Nothing
+    if (l > ghcup_ver) then pure $ Just (GHCup, mkTVer l) else pure Nothing
 
   otherTools <- forM [GHC, Cabal, HLS, Stack] $ \t ->
     forMM (getLatest dls t) $ \(l, _) -> do

app/ghcup/GHCup/OptParse/Compile.hs

@@ -57,6 +57,7 @@ import Text.Read (readEither)
 
 data CompileCommand = CompileGHC GHCCompileOptions
                     | CompileHLS HLSCompileOptions
+                    deriving (Eq, Show)
 
 
 
@@ -66,7 +67,7 @@ data CompileCommand = CompileGHC GHCCompileOptions
 
 
 data GHCCompileOptions = GHCCompileOptions
-  { targetGhc    :: GHC.GHCVer Version
+  { targetGhc    :: GHC.GHCVer
   , bootstrapGhc :: Either Version FilePath
   , jobs         :: Maybe Int
   , buildConfig  :: Maybe FilePath
@@ -76,9 +77,9 @@ data GHCCompileOptions = GHCCompileOptions
   , setCompile   :: Bool
   , ovewrwiteVer :: Maybe Version
   , buildFlavour :: Maybe String
-  , hadrian      :: Bool
+  , buildSystem  :: Maybe BuildSystem
   , isolateDir   :: Maybe FilePath
-  }
+  } deriving (Eq, Show)
 
 
 data HLSCompileOptions = HLSCompileOptions
@@ -93,7 +94,7 @@ data HLSCompileOptions = HLSCompileOptions
   , patches      :: Maybe (Either FilePath [URI])
   , targetGHCs   :: [ToolVersion]
   , cabalArgs    :: [Text]
-  }
+  } deriving (Eq, Show)
 
 
 
@@ -170,7 +171,7 @@ ghcCompileOpts =
           )
           (short 'v' <> long "version" <> metavar "VERSION" <> help
             "The tool version to compile"
-            <> (completer $ versionCompleter Nothing GHC)
+            <> (completer $ versionCompleter [] GHC)
           )
           ) <|>
           (GHC.GitDist <$> (GitBranch <$> option
@@ -205,7 +206,7 @@ ghcCompileOpts =
           <> metavar "BOOTSTRAP_GHC"
           <> help
                "The GHC version (or full path) to bootstrap with (must be installed)"
-          <> (completer $ versionCompleter Nothing GHC)
+          <> (completer $ versionCompleter [] GHC)
           )
     <*> optional
           (option
@@ -258,7 +259,7 @@ ghcCompileOpts =
             )
             (short 'o' <> long "overwrite-version" <> metavar "OVERWRITE_VERSION" <> help
               "Allows to overwrite the finally installed VERSION with a different one, e.g. when you build 8.10.4 with your own patches, you might want to set this to '8.10.4-p1'"
-            <> (completer $ versionCompleter Nothing GHC)
+            <> (completer $ versionCompleter [] GHC)
             )
           )
     <*> optional
@@ -268,16 +269,22 @@ ghcCompileOpts =
               "Set the compile build flavour (this value depends on the build system type: 'make' vs 'hadrian')"
             )
           )
-    <*> switch
-          (long "hadrian" <> help "Use the hadrian build system instead of make (only git versions seem to be properly supported atm)"
+    <*> (
+         (\b -> if b then Just Hadrian else Nothing) <$> switch
+          (long "hadrian" <> help "Use the hadrian build system instead of make. Tries to detect by default."
           )
+         <|>
+         (\b -> if b then Just Make else Nothing) <$> switch
+          (long "make" <> help "Use the make build system instead of hadrian. Tries to detect by default."
+          )
+        )
     <*> optional
           (option
             (eitherReader isolateParser)
             (  short 'i'
             <> long "isolate"
             <> metavar "DIR"
-            <> help "install in an isolated directory instead of the default one, no symlinks to this installation will be made"
+            <> help "install in an isolated absolute directory instead of the default one, no symlinks to this installation will be made"
             <> completer (bashCompleter "directory")
             )
            )
@@ -291,7 +298,7 @@ hlsCompileOpts =
           )
           (short 'v' <> long "version" <> metavar "VERSION" <> help
             "The version to compile (pulled from hackage)"
-            <> (completer $ versionCompleter' Nothing HLS (either (const False) (const True) . V.pvp . V.prettyVer))
+            <> (completer $ versionCompleter' [] HLS (either (const False) (const True) . V.pvp . V.prettyVer))
           )
           )
           <|>
@@ -311,7 +318,7 @@ hlsCompileOpts =
             )
           (long "source-dist" <> metavar "VERSION" <> help
             "The version to compile (pulled from packaged git sources)"
-            <> (completer $ versionCompleter Nothing HLS)
+            <> (completer $ versionCompleter [] HLS)
           )
           ))
           <|>
@@ -343,7 +350,7 @@ hlsCompileOpts =
             )
             (short 'o' <> long "overwrite-version" <> metavar "OVERWRITE_VERSION" <> help
               "Allows to overwrite the finally installed VERSION with a different one, e.g. when you build 8.10.4 with your own patches, you might want to set this to '8.10.4-p1'"
-            <> (completer $ versionCompleter Nothing HLS)
+            <> (completer $ versionCompleter [] HLS)
             )
           )
           <|>
@@ -360,7 +367,7 @@ hlsCompileOpts =
             (  short 'i'
             <> long "isolate"
             <> metavar "DIR"
-            <> help "install in an isolated directory instead of the default one, no symlinks to this installation will be made"
+            <> help "install in an isolated absolute directory instead of the default one, no symlinks to this installation will be made"
             <> completer (bashCompleter "directory")
             )
            )
@@ -403,7 +410,7 @@ hlsCompileOpts =
           option (eitherReader ghcVersionTagEither)
             (  long "ghc" <> metavar "GHC_VERSION|TAG" <> help "For which GHC version to compile for (can be specified multiple times)"
             <> completer (tagCompleter GHC [])
-            <> completer (versionCompleter Nothing GHC))
+            <> completer (versionCompleter [] GHC))
         )
     <*> many (argument str (metavar "CABAL_ARGS" <> help "Additional arguments to cabal install, prefix with '-- ' (longopts)"))
 
@@ -453,6 +460,7 @@ type HLSEffects = '[ AlreadyInstalled
                   , UnknownArchive
                   , TarDirDoesNotExist
                   , TagNotFound
+                  , DayNotFound
                   , NextVerNotFound
                   , NoToolVersionSet
                   , NotInstalled
@@ -510,7 +518,7 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
         case targetHLS of
           HLS.SourceDist targetVer -> do
             GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-            let vi = getVersionInfo targetVer HLS dls
+            let vi = getVersionInfo (mkTVer targetVer) HLS dls
             forM_ (_viPreCompile =<< vi) $ \msg -> do
               lift $ logInfo msg
               lift $ logInfo
@@ -530,7 +538,7 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
                     patches
                     cabalArgs
         GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-        let vi = getVersionInfo targetVer HLS dls
+        let vi = getVersionInfo (mkTVer targetVer) HLS dls
         when setCompile $ void $ liftE $
           setHLS targetVer SetHLSOnly Nothing
         pure (vi, targetVer)
@@ -554,15 +562,12 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
               VLeft e -> do
                 runLogger $ logError $ T.pack $ prettyHFError e
                 pure $ ExitFailure 9
-    (CompileGHC GHCCompileOptions { hadrian = True, crossTarget = Just _ }) -> do
-      runLogger $ logError "Hadrian cross compile support is not yet implemented!"
-      pure $ ExitFailure 9
     (CompileGHC GHCCompileOptions {..}) ->
       runCompileGHC runAppState (do
         case targetGhc of
           GHC.SourceDist targetVer -> do
             GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-            let vi = getVersionInfo targetVer GHC dls
+            let vi = getVersionInfo (mkTVer targetVer) GHC dls
             forM_ (_viPreCompile =<< vi) $ \msg -> do
               lift $ logInfo msg
               lift $ logInfo
@@ -570,10 +575,8 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
               liftIO $ threadDelay 5000000 -- for compilation, give the user a sec to intervene
           _ -> pure ()
         targetVer <- liftE $ compileGHC
-                    ((\case
-                        GHC.SourceDist v -> GHC.SourceDist $ GHCTargetVersion crossTarget v
-                        GHC.GitDist g -> GHC.GitDist g
-                        GHC.RemoteDist r -> GHC.RemoteDist r) targetGhc)
+                    targetGhc
+                    crossTarget
                     ovewrwiteVer
                     bootstrapGhc
                     jobs
@@ -581,10 +584,10 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
                     patches
                     addConfArgs
                     buildFlavour
-                    hadrian
+                    buildSystem
                     (maybe GHCupInternal IsolateDir isolateDir)
         GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-        let vi = getVersionInfo (_tvVersion targetVer) GHC dls
+        let vi = getVersionInfo targetVer GHC dls
         when setCompile $ void $ liftE $
           setGHC targetVer SetGHCOnly Nothing
         pure (vi, targetVer)

app/ghcup/GHCup/OptParse/Config.hs

@@ -51,7 +51,8 @@ data ConfigCommand
   = ShowConfig
   | SetConfig String (Maybe String)
   | InitConfig
-  | AddReleaseChannel URI
+  | AddReleaseChannel Bool URI
+  deriving (Eq, Show)
 
 
 
@@ -59,7 +60,7 @@ data ConfigCommand
     --[ Parsers ]--
     ---------------
 
-          
+
 configP :: Parser ConfigCommand
 configP = subparser
       (  command "init" initP
@@ -74,7 +75,7 @@ configP = subparser
   showP = info (pure ShowConfig) (progDesc "Show current config (default)")
   setP  = info argsP (progDesc "Set config KEY to VALUE (or specify as single json value)" <> footerDoc (Just $ text configSetFooter))
   argsP = SetConfig <$> argument str (metavar "<JSON_VALUE | YAML_KEY>") <*> optional (argument str (metavar "YAML_VALUE"))
-  addP  = info (AddReleaseChannel <$> argument (eitherReader uriParser) (metavar "URI" <> completer fileUri))
+  addP  = info (AddReleaseChannel <$> switch (long "force" <> help "Delete existing entry (if any) and append instead of failing") <*> argument (eitherReader uriParser) (metavar "URI" <> completer fileUri))
     (progDesc "Add a release channel from a URI")
 
 
@@ -120,21 +121,38 @@ formatConfig :: UserSettings -> String
 formatConfig = UTF8.toString . Y.encode
 
 
-updateSettings :: UserSettings -> Settings -> Settings
-updateSettings UserSettings{..} Settings{..} =
-   let cache'      = fromMaybe cache uCache
-       metaCache'  = fromMaybe metaCache uMetaCache
-       metaMode'   = fromMaybe metaMode uMetaMode
-       noVerify'   = fromMaybe noVerify uNoVerify
-       keepDirs'   = fromMaybe keepDirs uKeepDirs
-       downloader' = fromMaybe downloader uDownloader
-       verbose'    = fromMaybe verbose uVerbose
-       urlSource'  = fromMaybe urlSource uUrlSource
-       noNetwork'  = fromMaybe noNetwork uNoNetwork
-       gpgSetting' = fromMaybe gpgSetting uGPGSetting
-       platformOverride' = uPlatformOverride <|> platformOverride
-       mirrors' = fromMaybe mirrors uMirrors
-   in Settings cache' metaCache' metaMode' noVerify' keepDirs' downloader' verbose' urlSource' noNetwork' gpgSetting' noColor platformOverride' mirrors'
+updateSettings :: UserSettings -> UserSettings -> UserSettings
+updateSettings usl usr =
+   let cache'      = uCache usl      <|> uCache usr
+       metaCache'  = uMetaCache usl  <|> uMetaCache usr
+       metaMode'   = uMetaMode usl   <|> uMetaMode usr
+       noVerify'   = uNoVerify usl   <|> uNoVerify usr
+       verbose'    = uVerbose usl    <|> uVerbose usr
+       keepDirs'   = uKeepDirs usl   <|> uKeepDirs usr
+       downloader' = uDownloader usl <|> uDownloader usr
+       urlSource'  = uUrlSource usl  <|> uUrlSource usr
+       noNetwork'  = uNoNetwork usl  <|> uNoNetwork usr
+       gpgSetting' = uGPGSetting usl <|> uGPGSetting usr
+       platformOverride' = uPlatformOverride usl <|> uPlatformOverride usr
+       mirrors' = uMirrors usl <|> uMirrors usr
+   in UserSettings cache' metaCache' metaMode' noVerify' verbose' keepDirs' downloader' (updateKeyBindings (uKeyBindings usl) (uKeyBindings usr)) urlSource' noNetwork' gpgSetting' platformOverride' mirrors'
+ where
+  updateKeyBindings :: Maybe UserKeyBindings -> Maybe UserKeyBindings -> Maybe UserKeyBindings
+  updateKeyBindings Nothing Nothing = Nothing
+  updateKeyBindings (Just kbl) Nothing = Just kbl
+  updateKeyBindings Nothing (Just kbr) = Just kbr
+  updateKeyBindings (Just kbl) (Just kbr) =
+       Just $ UserKeyBindings {
+           kUp = kUp kbl <|> kUp kbr
+         , kDown = kDown kbl <|> kDown kbr
+         , kQuit = kQuit kbl <|> kQuit kbr
+         , kInstall = kInstall kbl <|> kInstall kbr
+         , kUninstall = kUninstall kbl <|> kUninstall kbr
+         , kSet = kSet kbl <|> kSet kbr
+         , kChangelog = kChangelog kbl <|> kChangelog kbr
+         , kShowAll = kShowAll kbl <|> kShowAll kbr
+         , kShowAllTools = kShowAllTools kbl <|> kShowAllTools kbr
+         }
 
 
 
@@ -142,6 +160,9 @@ updateSettings UserSettings{..} Settings{..} =
     --[ Entrypoint ]--
     ------------------
 
+data Duplicate = Duplicate     -- ^ there is a duplicate somewhere in the middle
+               | NoDuplicate   -- ^ there is no duplicate
+               | DuplicateLast -- ^ there's a duplicate, but it's the last element
 
 
 config :: forall m. ( Monad m
@@ -151,10 +172,11 @@ config :: forall m. ( Monad m
           )
      => ConfigCommand
      -> Settings
+     -> UserSettings
      -> KeyBindings
      -> (ReaderT LeanAppState m () -> m ())
      -> m ExitCode
-config configCommand settings keybindings runLogger = case configCommand of
+config configCommand settings userConf keybindings runLogger = case configCommand of
   InitConfig -> do
     path <- getConfigFilePath
     liftIO $ writeFile path $ formatConfig $ fromSettings settings (Just keybindings)
@@ -185,27 +207,55 @@ config configCommand settings keybindings runLogger = case configCommand of
         pure $ ExitFailure 65
       VLeft _ -> pure $ ExitFailure 65
 
-  AddReleaseChannel uri -> do
-    case urlSource settings of
-      AddSource xs -> do
-        doConfig (defaultUserSettings { uUrlSource = Just $ AddSource (xs <> [Right uri]) })
-        pure ExitSuccess
-      GHCupURL -> do
-        doConfig (defaultUserSettings { uUrlSource = Just $ AddSource [Right uri] })
-        pure ExitSuccess
-      OwnSource xs -> do
-        doConfig (defaultUserSettings { uUrlSource = Just $ OwnSource (xs <> [Right uri]) })
-        pure ExitSuccess
-      OwnSpec spec -> do
-        doConfig (defaultUserSettings { uUrlSource = Just $ OwnSource ([Left spec, Right uri]) })
+  AddReleaseChannel force uri -> do
+    r <- runE @'[DuplicateReleaseChannel] $ do
+      case urlSource settings of
+        AddSource xs -> do
+          case checkDuplicate xs (Right uri) of
+            Duplicate
+              | not force -> throwE (DuplicateReleaseChannel uri)
+            DuplicateLast -> pure ()
+            _ -> lift $ doConfig (defaultUserSettings { uUrlSource = Just $ AddSource (appendUnique xs (Right uri)) })
+        GHCupURL -> do
+          lift $ doConfig (defaultUserSettings { uUrlSource = Just $ AddSource [Right uri] })
+          pure ()
+        OwnSource xs -> do
+          case checkDuplicate xs (Right uri) of
+            Duplicate
+              | not force -> throwE (DuplicateReleaseChannel uri)
+            DuplicateLast -> pure ()
+            _ -> lift $ doConfig (defaultUserSettings { uUrlSource = Just $ OwnSource (appendUnique xs (Right uri)) })
+        OwnSpec spec -> do
+          lift $ doConfig (defaultUserSettings { uUrlSource = Just $ OwnSource [Left spec, Right uri] })
+          pure ()
+    case r of
+      VRight _ -> do
         pure ExitSuccess
+      VLeft e -> do
+        runLogger $ logError $ T.pack $ prettyHFError e
+        pure $ ExitFailure 15
 
  where
+  checkDuplicate :: Eq a => [a] -> a -> Duplicate
+  checkDuplicate xs a
+    | last xs == a = DuplicateLast
+    | a `elem` xs  = Duplicate
+    | otherwise    = NoDuplicate
+
+  -- appends the element to the end of the list, but also removes it from the existing list
+  appendUnique :: Eq a => [a] -> a -> [a]
+  appendUnique xs' e = go xs'
+   where
+    go [] = [e]
+    go (x:xs)
+      | x == e    =     go xs -- skip
+      | otherwise = x : go xs
+
   doConfig :: MonadIO m => UserSettings -> m ()
   doConfig usersettings = do
-    let settings' = updateSettings usersettings settings
+    let settings' = updateSettings usersettings userConf
     path <- liftIO getConfigFilePath
-    liftIO $ writeFile path $ formatConfig $ fromSettings settings' (Just keybindings)
+    liftIO $ writeFile path $ formatConfig $ settings'
     runLogger $ logDebug $ T.pack $ show settings'
     pure ()
 

app/ghcup/GHCup/OptParse/GC.hs

@@ -47,7 +47,7 @@ data GCOptions = GCOptions
   , gcHLSNoGHC :: Bool
   , gcCache :: Bool
   , gcTmp :: Bool
-  }
+  } deriving (Eq, Show)
 
 
 

app/ghcup/GHCup/OptParse/Install.hs

@@ -54,6 +54,7 @@ data InstallCommand = InstallGHC InstallOptions
                     | InstallCabal InstallOptions
                     | InstallHLS InstallOptions
                     | InstallStack InstallOptions
+                    deriving (Eq, Show)
 
 
 
@@ -70,7 +71,7 @@ data InstallOptions = InstallOptions
   , isolateDir   :: Maybe FilePath
   , forceInstall :: Bool
   , addConfArgs  :: [T.Text]
-  }
+  } deriving (Eq, Show)
 
 
 
@@ -184,7 +185,7 @@ installOpts tool =
                       <> completer (toolDlCompleter (fromMaybe GHC tool))
                     )
                   )
-            <*> (Just <$> toolVersionTagArgument Nothing tool)
+            <*> (Just <$> toolVersionTagArgument [] tool)
             )
         <|> pure (Nothing, Nothing)
         )
@@ -196,7 +197,7 @@ installOpts tool =
            (  short 'i'
            <> long "isolate"
            <> metavar "DIR"
-           <> help "install in an isolated dir instead of the default one"
+           <> help "install in an isolated absolute directory instead of the default one"
            <> completer (bashCompleter "directory")
            )
           )
@@ -241,6 +242,7 @@ type InstallEffects = '[ AlreadyInstalled
                        , NotInstalled
                        , BuildFailed
                        , TagNotFound
+                       , DayNotFound
                        , DigestError
                        , ContentLengthError
                        , GPGError
@@ -284,6 +286,7 @@ type InstallGHCEffects = '[ AlreadyInstalled
                           , NotInstalled
                           , ProcessError
                           , TagNotFound
+                          , DayNotFound
                           , TarDirDoesNotExist
                           , UninstallFailed
                           , UnknownArchive
@@ -322,7 +325,7 @@ install installCommand settings getAppState' runLogger = case installCommand of
        Nothing -> runInstGHC s' $ do
          (v, vi) <- liftE $ fromVersion instVer GHC
          liftE $ runBothE' (installGHCBin
-                     (_tvVersion v)
+                     v
                      (maybe GHCupInternal IsolateDir isolateDir)
                      forceInstall
                      addConfArgs
@@ -333,8 +336,8 @@ install installCommand settings getAppState' runLogger = case installCommand of
          runInstGHC s'{ settings = settings {noVerify = True}} $ do
            (v, vi) <- liftE $ fromVersion instVer GHC
            liftE $ runBothE' (installGHCBindist
-                       (DownloadInfo uri (Just $ RegexDir "ghc-.*") "" Nothing)
-                       (_tvVersion v)
+                       (DownloadInfo uri (Just $ RegexDir "ghc-.*") "" Nothing Nothing)
+                       v
                        (maybe GHCupInternal IsolateDir isolateDir)
                        forceInstall
                        addConfArgs
@@ -403,7 +406,7 @@ install installCommand settings getAppState' runLogger = case installCommand of
          runInstTool s'{ settings = settings { noVerify = True}} $ do
            (_tvVersion -> v, vi) <- liftE $ fromVersion instVer Cabal
            liftE $ runBothE' (installCabalBindist
-                                      (DownloadInfo uri Nothing "" Nothing)
+                                      (DownloadInfo uri Nothing "" Nothing Nothing)
                                       v
                                       (maybe GHCupInternal IsolateDir isolateDir)
                                       forceInstall
@@ -453,7 +456,7 @@ install installCommand settings getAppState' runLogger = case installCommand of
            (_tvVersion -> v, vi) <- liftE $ fromVersion instVer HLS
            -- TODO: support legacy
            liftE $ runBothE' (installHLSBindist
-                                      (DownloadInfo uri (if isWindows then Nothing else Just (RegexDir "haskell-language-server-*")) "" Nothing)
+                                      (DownloadInfo uri (if isWindows then Nothing else Just (RegexDir "haskell-language-server-*")) "" Nothing Nothing)
                                       v
                                       (maybe GHCupInternal IsolateDir isolateDir)
                                       forceInstall
@@ -502,7 +505,7 @@ install installCommand settings getAppState' runLogger = case installCommand of
           runInstTool s'{ settings = settings { noVerify = True}} $ do
             (_tvVersion -> v, vi) <- liftE $ fromVersion instVer Stack
             liftE $ runBothE' (installStackBindist
-                                       (DownloadInfo uri Nothing "" Nothing)
+                                       (DownloadInfo uri Nothing "" Nothing Nothing)
                                        v
                                        (maybe GHCupInternal IsolateDir isolateDir)
                                        forceInstall

app/ghcup/GHCup/OptParse/List.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes       #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE RankNTypes #-}
 
@@ -14,6 +15,7 @@ import           GHCup
 import           GHCup.Prelude
 import           GHCup.Types
 import           GHCup.OptParse.Common
+import           GHCup.Prelude.String.QQ
 
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -24,6 +26,7 @@ import           Data.Char
 import           Data.List                      ( intercalate, sort )
 import           Data.Functor
 import           Data.Maybe
+import           Data.Time.Calendar             ( Day )
 import           Data.Versions           hiding ( str )
 import           Data.Void
 import           Options.Applicative     hiding ( style )
@@ -50,8 +53,12 @@ import qualified Text.Megaparsec.Char          as MPC
 data ListOptions = ListOptions
   { loTool     :: Maybe Tool
   , lCriteria  :: Maybe ListCriteria
+  , lFrom      :: Maybe Day
+  , lTo        :: Maybe Day
+  , lHideOld   :: Bool
+  , lShowNightly :: Bool
   , lRawFormat :: Bool
-  }
+  } deriving (Eq, Show)
 
 
 
@@ -60,7 +67,6 @@ data ListOptions = ListOptions
     --[ Parsers ]--
     ---------------
 
-          
 listOpts :: Parser ListOptions
 listOpts =
   ListOptions
@@ -69,7 +75,7 @@ listOpts =
             (eitherReader toolParser)
             (short 't' <> long "tool" <> metavar "<ghc|cabal|hls|stack>" <> help
               "Tool to list versions for. Default is all"
-              <> completer (toolCompleter)
+              <> completer toolCompleter
             )
           )
     <*> optional
@@ -78,15 +84,53 @@ listOpts =
             (  short 'c'
             <> long "show-criteria"
             <> metavar "<installed|set|available>"
-            <> help "Show only installed/set/available tool versions"
-              <> completer (listCompleter ["installed", "set", "available"])
+            <> help "Apply filtering criteria, prefix with + or -"
+              <> completer (listCompleter
+                [ "+installed", "+set", "+available", "-installed", "-set", "-available"])
             )
           )
+    <*> optional
+          (option
+            (eitherReader dayParser)
+            (short 's' <> long "since" <> metavar "YYYY-MM-DD" <> help
+              "List only tools with release date starting at YYYY-MM-DD or later"
+              <> completer toolCompleter
+            )
+          )
+    <*> optional
+          (option
+            (eitherReader dayParser)
+            (short 'u' <> long "until" <> metavar "YYYY-MM-DD" <> help
+              "List only tools with release date earlier than YYYY-MM-DD"
+              <> completer toolCompleter
+            )
+          )
+    <*> switch
+          (short 'o' <> long "hide-old" <> help "Hide 'old' GHC versions (installed ones are always shown)"
+          )
+    <*> switch
+          (short 'n' <> long "show-nightly" <> help "Show nightlies (installed ones are always shown)"
+          )
     <*> switch
           (short 'r' <> long "raw-format" <> help "More machine-parsable format"
           )
 
 
+    --------------
+    --[ Footer ]--
+    --------------
+
+
+listToolFooter :: String
+listToolFooter = [s|Discussion:
+  Lists tool versions with optional criteria.
+  Nightlies are by default hidden.
+
+Examples:
+  # query nightlies in a specific range
+  ghcup list --show-nightly --since 2022-12-07 --until 2022-12-31
+  # show all installed GHC versions
+  ghcup list -t ghc -c installed|]
 
 
     -----------------
@@ -105,8 +149,11 @@ printListResult no_color raw lr = do
     printTag Recommended        = color Green "recommended"
     printTag Latest             = color Yellow "latest"
     printTag Prerelease         = color Red "prerelease"
+    printTag Nightly            = color Red "nightly"
     printTag (Base       pvp'') = "base-" ++ T.unpack (prettyPVP pvp'')
     printTag (UnknownTag t    ) = t
+    printTag LatestPrerelease   = color Red "latest-prerelease"
+    printTag LatestNightly      = color Red "latest-nightly"
     printTag Old                = ""
 
   let
@@ -133,8 +180,10 @@ printListResult no_color raw lr = do
                           then [color Green "hls-powered"]
                           else mempty
                         )
-                     ++ (if fromSrc then [color Blue "compiled"] else mempty)
                      ++ (if lStray then [color Yellow "stray"] else mempty)
+                     ++ (case lReleaseDay of
+                           Nothing -> mempty
+                           Just d  -> [color Blue (show d)])
                      ++ (if lNoBindist
                           then [color Red "no-bindist"]
                           else mempty
@@ -259,7 +308,7 @@ list :: ( Monad m
       -> m ExitCode
 list ListOptions{..} no_color runAppState =
   runAppState (do
-      l <- listVersions loTool lCriteria
+      l <- listVersions loTool (maybeToList lCriteria) lHideOld lShowNightly (lFrom, lTo)
       liftIO $ printListResult no_color lRawFormat l
       pure ExitSuccess
     )

app/ghcup/GHCup/OptParse/Nuke.hs

@@ -76,8 +76,8 @@ nuke appState runLogger = do
 
        lift $ logInfo "Initiating Nuclear Sequence 🚀🚀🚀"
        lift $ logInfo "Nuking in 3...2...1"
-  
-       lInstalled <- lift $ listVersions Nothing (Just ListInstalled)
+
+       lInstalled <- lift $ listVersions Nothing [ListInstalled True] False True (Nothing, Nothing)
 
        forM_ lInstalled (liftE . rmTool)
 

app/ghcup/GHCup/OptParse/Prefetch.hs

@@ -83,7 +83,7 @@ prefetchP = subparser
           <$> (PrefetchGHCOptions
                 <$> ( switch (short 's' <> long "source" <> help "Download source tarball instead of bindist") <**> helper )
                 <*> optional (option str (short 'd' <> long "directory" <> help "directory to download into (default: ~/.ghcup/cache/)" <> completer (bashCompleter "directory"))))
-          <*>  optional (toolVersionTagArgument Nothing (Just GHC)) )
+          <*>  optional (toolVersionTagArgument [] (Just GHC)) )
         ( progDesc "Download GHC assets for installation")
       )
       <>
@@ -92,7 +92,7 @@ prefetchP = subparser
       (info
         (PrefetchCabal
           <$> fmap PrefetchOptions (optional (option str (short 'd' <> long "directory" <> help "directory to download into (default: ~/.ghcup/cache/)" <> completer (bashCompleter "directory"))))
-          <*> ( optional (toolVersionTagArgument Nothing (Just Cabal)) <**> helper ))
+          <*> ( optional (toolVersionTagArgument [] (Just Cabal)) <**> helper ))
         ( progDesc "Download cabal assets for installation")
       )
       <>
@@ -101,7 +101,7 @@ prefetchP = subparser
       (info
         (PrefetchHLS
           <$> fmap PrefetchOptions (optional (option str (short 'd' <> long "directory" <> help "directory to download into (default: ~/.ghcup/cache/)" <> completer (bashCompleter "directory"))))
-          <*> ( optional (toolVersionTagArgument Nothing (Just HLS)) <**> helper ))
+          <*> ( optional (toolVersionTagArgument [] (Just HLS)) <**> helper ))
         ( progDesc "Download HLS assets for installation")
       )
       <>
@@ -110,7 +110,7 @@ prefetchP = subparser
       (info
         (PrefetchStack
           <$> fmap PrefetchOptions (optional (option str (short 'd' <> long "directory" <> help "directory to download into (default: ~/.ghcup/cache/)" <> completer (bashCompleter "directory"))))
-          <*> ( optional (toolVersionTagArgument Nothing (Just Stack)) <**> helper ))
+          <*> ( optional (toolVersionTagArgument [] (Just Stack)) <**> helper ))
         ( progDesc "Download stack assets for installation")
       )
       <>
@@ -148,6 +148,7 @@ Examples:
 
 
 type PrefetchEffects = '[ TagNotFound
+                        , DayNotFound
                         , NextVerNotFound
                         , NoToolVersionSet
                         , NoDownload
@@ -194,7 +195,7 @@ prefetch prefetchCommand runAppState runLogger =
           forM_ pfCacheDir (liftIO . createDirRecursive')
           (v, _) <- liftE $ fromVersion mt GHC
           if pfGHCSrc
-          then liftE $ fetchGHCSrc (_tvVersion v) pfCacheDir
+          then liftE $ fetchGHCSrc v pfCacheDir
           else liftE $ fetchToolBindist (_tvVersion v) GHC pfCacheDir
       PrefetchCabal PrefetchOptions {pfCacheDir} mt   -> do
         forM_ pfCacheDir (liftIO . createDirRecursive')

app/ghcup/GHCup/OptParse/Rm.hs

@@ -50,6 +50,7 @@ data RmCommand = RmGHC RmOptions
                | RmCabal Version
                | RmHLS Version
                | RmStack Version
+               deriving (Eq, Show)
 
 
 
@@ -61,7 +62,7 @@ data RmCommand = RmGHC RmOptions
 
 data RmOptions = RmOptions
   { ghcVer :: GHCTargetVersion
-  }
+  } deriving (Eq, Show)
 
 
 
@@ -80,19 +81,19 @@ rmParser =
       <> command
            "cabal"
            (   RmCabal
-           <$> info (versionParser' (Just ListInstalled) (Just Cabal) <**> helper)
+           <$> info (versionParser' [ListInstalled True] (Just Cabal) <**> helper)
                     (progDesc "Remove Cabal version")
            )
       <> command
            "hls"
            (   RmHLS
-           <$> info (versionParser' (Just ListInstalled) (Just HLS) <**> helper)
+           <$> info (versionParser' [ListInstalled True] (Just HLS) <**> helper)
                     (progDesc "Remove haskell-language-server version")
            )
       <> command
            "stack"
            (   RmStack
-           <$> info (versionParser' (Just ListInstalled) (Just Stack) <**> helper)
+           <$> info (versionParser' [ListInstalled True] (Just Stack) <**> helper)
                     (progDesc "Remove stack version")
            )
       )
@@ -102,7 +103,7 @@ rmParser =
 
 
 rmOpts :: Maybe Tool -> Parser RmOptions
-rmOpts tool = RmOptions <$> ghcVersionArgument (Just ListInstalled) tool
+rmOpts tool = RmOptions <$> ghcVersionArgument [ListInstalled True] tool
 
 
 
@@ -170,7 +171,7 @@ rm rmCommand runAppState runLogger = case rmCommand of
         liftE $
           rmGHCVer ghcVer
         GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-        pure (getVersionInfo (_tvVersion ghcVer) GHC dls)
+        pure (getVersionInfo ghcVer GHC dls)
       )
       >>= \case
             VRight vi -> do
@@ -186,7 +187,7 @@ rm rmCommand runAppState runLogger = case rmCommand of
         liftE $
           rmCabalVer tv
         GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-        pure (getVersionInfo tv Cabal dls)
+        pure (getVersionInfo (mkTVer tv) Cabal dls)
       )
       >>= \case
             VRight vi -> do
@@ -201,7 +202,7 @@ rm rmCommand runAppState runLogger = case rmCommand of
         liftE $
           rmHLSVer tv
         GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-        pure (getVersionInfo tv HLS dls)
+        pure (getVersionInfo (mkTVer tv) HLS dls)
       )
       >>= \case
             VRight vi -> do
@@ -216,7 +217,7 @@ rm rmCommand runAppState runLogger = case rmCommand of
         liftE $
           rmStackVer tv
         GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-        pure (getVersionInfo tv Stack dls)
+        pure (getVersionInfo (mkTVer tv) Stack dls)
       )
       >>= \case
             VRight vi -> do

app/ghcup/GHCup/OptParse/Run.hs

@@ -68,7 +68,7 @@ data RunOptions = RunOptions
   , runBinDir     :: Maybe FilePath
   , runQuick      :: Bool
   , runCOMMAND    :: [String]
-  }
+  } deriving (Eq, Show)
 
 
 
@@ -92,7 +92,7 @@ runOpts =
             (eitherReader ghcVersionTagEither)
             (metavar "GHC_VERSION" <> long "ghc" <> help "The ghc version"
             <> completer (tagCompleter GHC [])
-            <> (completer $ versionCompleter Nothing GHC)
+            <> (completer $ versionCompleter [] GHC)
             )
           )
     <*> optional
@@ -100,7 +100,7 @@ runOpts =
             (eitherReader toolVersionTagEither)
             (metavar "CABAL_VERSION" <> long "cabal" <> help "The cabal version"
             <> completer (tagCompleter Cabal [])
-            <> (completer $ versionCompleter Nothing Cabal)
+            <> (completer $ versionCompleter [] Cabal)
             )
           )
     <*> optional
@@ -108,7 +108,7 @@ runOpts =
             (eitherReader toolVersionTagEither)
             (metavar "HLS_VERSION" <> long "hls" <> help "The HLS version"
             <> completer (tagCompleter HLS [])
-            <> (completer $ versionCompleter Nothing HLS)
+            <> (completer $ versionCompleter [] HLS)
             )
           )
     <*> optional
@@ -116,7 +116,7 @@ runOpts =
             (eitherReader toolVersionTagEither)
             (metavar "STACK_VERSION" <> long "stack" <> help "The stack version"
             <> completer (tagCompleter Stack [])
-            <> (completer $ versionCompleter Nothing Stack)
+            <> (completer $ versionCompleter [] Stack)
             )
           )
     <*> optional
@@ -132,7 +132,7 @@ runOpts =
     <*> switch
           (short 'q' <> long "quick" <> help "Avoid any expensive work (such as downloads, version/tag resolution etc.). Disables --install.")
     <*> many (argument str (metavar "COMMAND" <> help "The command to run, with arguments (use longopts --). If omitted, just prints the created bin/ dir to stdout and exits."))
-          
+
 
 
 
@@ -175,6 +175,7 @@ type RunEffects = '[ AlreadyInstalled
                    , NotInstalled
                    , BuildFailed
                    , TagNotFound
+                   , DayNotFound
                    , DigestError
                    , ContentLengthError
                    , GPGError
@@ -282,6 +283,7 @@ run RunOptions{..} runAppState leanAppstate runLogger = do
                            )
                         => Excepts
                              '[ TagNotFound
+                              , DayNotFound
                               , NextVerNotFound
                               , NoToolVersionSet
                               ] (ResourceT (ReaderT AppState m)) Toolchain
@@ -332,6 +334,7 @@ run RunOptions{..} runAppState leanAppstate runLogger = do
                         -> FilePath
                         -> Excepts
                              '[ TagNotFound
+                              , DayNotFound
                               , NextVerNotFound
                               , NoToolVersionSet
                               , UnknownArchive
@@ -357,7 +360,7 @@ run RunOptions{..} runAppState leanAppstate runLogger = do
            Just v -> do
              isInstalled <- lift $ checkIfToolInstalled' GHC v
              unless isInstalled $ when (runInstTool' && isNothing (_tvTarget v)) $ void $ liftE $ installGHCBin
-               (_tvVersion v)
+               v
                GHCupInternal
                False
                []

app/ghcup/GHCup/OptParse/Set.hs

@@ -53,6 +53,7 @@ data SetCommand = SetGHC SetOptions
                 | SetCabal SetOptions
                 | SetHLS SetOptions
                 | SetStack SetOptions
+                deriving (Eq, Show)
 
 
 
@@ -64,7 +65,7 @@ data SetCommand = SetGHC SetOptions
 
 data SetOptions = SetOptions
   { sToolVer :: SetToolVersion
-  }
+  } deriving (Eq, Show)
 
 
 
@@ -139,9 +140,9 @@ setParser =
 setOpts :: Tool -> Parser SetOptions
 setOpts tool = SetOptions <$>
     (fromMaybe SetRecommended <$>
-      optional (setVersionArgument (Just ListInstalled) tool))
+      optional (setVersionArgument [ListInstalled True] tool))
 
-setVersionArgument :: Maybe ListCriteria -> Tool -> Parser SetToolVersion
+setVersionArgument :: [ListCriteria] -> Tool -> Parser SetToolVersion
 setVersionArgument criteria tool =
   argument (eitherReader setEither)
     (metavar "VERSION|TAG|next"
@@ -184,6 +185,7 @@ setFooter = [s|Discussion:
 type SetGHCEffects = '[ FileDoesNotExistError
                    , NotInstalled
                    , TagNotFound
+                   , DayNotFound
                    , NextVerNotFound
                    , NoToolVersionSet]
 
@@ -198,6 +200,7 @@ runSetGHC runAppState =
 
 type SetCabalEffects = '[ NotInstalled
                         , TagNotFound
+                        , DayNotFound
                         , NextVerNotFound
                         , NoToolVersionSet]
 
@@ -212,6 +215,7 @@ runSetCabal runAppState =
 
 type SetHLSEffects = '[ NotInstalled
                       , TagNotFound
+                      , DayNotFound
                       , NextVerNotFound
                       , NoToolVersionSet]
 
@@ -226,6 +230,7 @@ runSetHLS runAppState =
 
 type SetStackEffects = '[ NotInstalled
                         , TagNotFound
+                        , DayNotFound
                         , NextVerNotFound
                         , NoToolVersionSet]
 
@@ -259,7 +264,7 @@ set :: forall m env.
         -> m (VEither eff GHCTargetVersion))
     -> (ReaderT LeanAppState m () -> m ())
     -> m ExitCode
-set setCommand runAppState runLeanAppState runLogger = case setCommand of
+set setCommand runAppState _ runLogger = case setCommand of
   (Right sopts) -> do
     runLogger (logWarn "This is an old-style command for setting GHC. Use 'ghcup set ghc' instead.")
     setGHC' sopts
@@ -271,10 +276,7 @@ set setCommand runAppState runLeanAppState runLogger = case setCommand of
  where
   setGHC' :: SetOptions
           -> m ExitCode
-  setGHC' SetOptions{ sToolVer } =
-    case sToolVer of
-      (SetGHCVersion v) -> runSetGHC runLeanAppState (liftE $ setGHC v SetGHCOnly Nothing >> pure v)
-      _ -> runSetGHC runAppState (do
+  setGHC' SetOptions{ sToolVer } = runSetGHC runAppState (do
           v <- liftE $ fst <$> fromVersion' sToolVer GHC
           liftE $ setGHC v SetGHCOnly Nothing
         )
@@ -291,10 +293,7 @@ set setCommand runAppState runLeanAppState runLogger = case setCommand of
 
   setCabal' :: SetOptions
             -> m ExitCode
-  setCabal' SetOptions{ sToolVer } =
-    case sToolVer of
-      (SetToolVersion v) -> runSetCabal runLeanAppState (liftE $ setCabal v >> pure (mkTVer v))
-      _ -> runSetCabal runAppState (do
+  setCabal' SetOptions{ sToolVer } = runSetCabal runAppState (do
           v <- liftE $ fst <$> fromVersion' sToolVer Cabal
           liftE $ setCabal (_tvVersion v)
           pure v
@@ -311,10 +310,7 @@ set setCommand runAppState runLeanAppState runLogger = case setCommand of
 
   setHLS' :: SetOptions
           -> m ExitCode
-  setHLS' SetOptions{ sToolVer } =
-    case sToolVer of
-      (SetToolVersion v) -> runSetHLS runLeanAppState (liftE $ setHLS v SetHLSOnly Nothing >> pure (mkTVer v))
-      _ -> runSetHLS runAppState (do
+  setHLS' SetOptions{ sToolVer } = runSetHLS runAppState (do
           v <- liftE $ fst <$> fromVersion' sToolVer HLS
           liftE $ setHLS (_tvVersion v) SetHLSOnly Nothing
           pure v
@@ -332,10 +328,7 @@ set setCommand runAppState runLeanAppState runLogger = case setCommand of
 
   setStack' :: SetOptions
             -> m ExitCode
-  setStack' SetOptions{ sToolVer } =
-    case sToolVer of
-      (SetToolVersion v) -> runSetStack runLeanAppState (liftE $ setStack v >> pure (mkTVer v))
-      _ -> runSetStack runAppState (do
+  setStack' SetOptions{ sToolVer } = runSetStack runAppState (do
             v <- liftE $ fst <$> fromVersion' sToolVer Stack
             liftE $ setStack (_tvVersion v)
             pure v

app/ghcup/GHCup/OptParse/Test.hs

@@ -112,7 +112,7 @@ testOpts tool =
                       <> completer (toolDlCompleter (fromMaybe GHC tool))
                     )
                   )
-            <*> (Just <$> toolVersionTagArgument Nothing tool)
+            <*> (Just <$> toolVersionTagArgument [] tool)
             )
         <|> pure (Nothing, Nothing)
         )
@@ -140,6 +140,7 @@ type TestGHCEffects = [ DigestError
                       , TestFailed
                       , NextVerNotFound
                       , TagNotFound
+                      , DayNotFound
                       , NoToolVersionSet
                       ]
 
@@ -168,12 +169,12 @@ test testCommand settings getAppState' runLogger = case testCommand of
     (case testBindist of
        Nothing -> runTestGHC s' $ do
          (v, vi) <- liftE $ fromVersion testVer GHC
-         liftE $ testGHCVer (_tvVersion v) addMakeArgs
+         liftE $ testGHCVer v addMakeArgs
          pure vi
        Just uri -> do
          runTestGHC s'{ settings = settings {noVerify = True}} $ do
            (v, vi) <- liftE $ fromVersion testVer GHC
-           liftE $ testGHCBindist (DownloadInfo uri (Just $ RegexDir ".*/.*") "" Nothing) (_tvVersion v) addMakeArgs
+           liftE $ testGHCBindist (DownloadInfo uri (Just $ RegexDir ".*/.*") "" Nothing Nothing) v addMakeArgs
            pure vi
       )
         >>= \case

app/ghcup/GHCup/OptParse/UnSet.hs

@@ -48,6 +48,7 @@ data UnsetCommand = UnsetGHC   UnsetOptions
                   | UnsetCabal UnsetOptions
                   | UnsetHLS   UnsetOptions
                   | UnsetStack UnsetOptions
+                  deriving (Eq, Show)
 
 
 
@@ -59,7 +60,7 @@ data UnsetCommand = UnsetGHC   UnsetOptions
 
 data UnsetOptions = UnsetOptions
   { sToolVer :: Maybe T.Text -- target platform triple
-  }
+  } deriving (Eq, Show)
 
 
 
@@ -68,7 +69,7 @@ data UnsetOptions = UnsetOptions
     --[ Parsers ]--
     ---------------
 
-          
+
 unsetParser :: Parser UnsetCommand
 unsetParser =
   subparser
@@ -113,7 +114,14 @@ unsetParser =
   unsetGHCFooter :: String
   unsetGHCFooter = [s|Discussion:
     Unsets the the current GHC version. That means there won't
-    be a ~/.ghcup/bin/ghc anymore.|]
+    be a ~/.ghcup/bin/ghc anymore.
+
+Examples:
+  # unset ghc 
+  ghcup unset ghc
+
+  # unset ghc for the target version
+  ghcup unset ghc armv7-unknown-linux-gnueabihf|]
 
   unsetCabalFooter :: String
   unsetCabalFooter = [s|Discussion:

app/ghcup/GHCup/OptParse/Upgrade.hs

@@ -50,7 +50,7 @@ import Data.Versions         hiding (str)
 data UpgradeOpts = UpgradeInplace
                  | UpgradeAt FilePath
                  | UpgradeGHCupDir
-                 deriving Show
+                 deriving (Eq, Show)
 
 
 

app/ghcup/GHCup/OptParse/Whereis.hs

@@ -54,6 +54,7 @@ data WhereisCommand = WhereisTool Tool (Maybe ToolVersion)
                     | WhereisCacheDir
                     | WhereisLogsDir
                     | WhereisConfDir
+                    deriving (Eq, Show)
 
 
 
@@ -66,7 +67,7 @@ data WhereisCommand = WhereisTool Tool (Maybe ToolVersion)
 
 data WhereisOptions = WhereisOptions {
    directory :: Bool
-}
+} deriving (Eq, Show)
 
 
 
@@ -82,7 +83,7 @@ whereisP = subparser
     command
       "ghc"
       (WhereisTool GHC <$> info
-        ( optional (toolVersionTagArgument Nothing (Just GHC)) <**> helper )
+        ( optional (toolVersionTagArgument [] (Just GHC)) <**> helper )
         ( progDesc "Get GHC location"
         <> footerDoc (Just $ text whereisGHCFooter ))
       )
@@ -90,7 +91,7 @@ whereisP = subparser
      command
       "cabal"
       (WhereisTool Cabal <$> info
-        ( optional (toolVersionTagArgument Nothing (Just Cabal)) <**> helper )
+        ( optional (toolVersionTagArgument [] (Just Cabal)) <**> helper )
         ( progDesc "Get cabal location"
         <> footerDoc (Just $ text whereisCabalFooter ))
       )
@@ -98,7 +99,7 @@ whereisP = subparser
      command
       "hls"
       (WhereisTool HLS <$> info
-        ( optional (toolVersionTagArgument Nothing (Just HLS)) <**> helper )
+        ( optional (toolVersionTagArgument [] (Just HLS)) <**> helper )
         ( progDesc "Get HLS location"
         <> footerDoc (Just $ text whereisHLSFooter ))
       )
@@ -106,7 +107,7 @@ whereisP = subparser
      command
       "stack"
       (WhereisTool Stack <$> info
-        ( optional (toolVersionTagArgument Nothing (Just Stack)) <**> helper )
+        ( optional (toolVersionTagArgument [] (Just Stack)) <**> helper )
         ( progDesc "Get stack location"
         <> footerDoc (Just $ text whereisStackFooter ))
       )
@@ -222,6 +223,7 @@ type WhereisEffects = '[ NotInstalled
                 , NoToolVersionSet
                 , NextVerNotFound
                 , TagNotFound
+                , DayNotFound
                 ]
 
 

app/ghcup/Main.hs

@@ -63,7 +63,7 @@ import qualified GHCup.Types                   as Types
 
 
 
-toSettings :: Options -> IO (Settings, KeyBindings)
+toSettings :: Options -> IO (Settings, KeyBindings, UserSettings)
 toSettings options = do
   noColor <- isJust <$> lookupEnv "NO_COLOR"
   userConf <- runE @'[ JSONError ] ghcupConfigFile >>= \case
@@ -73,7 +73,7 @@ toSettings options = do
       pure defaultUserSettings
     _ -> do
       die "Unexpected error!"
-  pure $ mergeConf options userConf noColor
+  pure $ (\(s', k) -> (s', k, userConf)) $ mergeConf options userConf noColor
  where
    mergeConf :: Options -> UserSettings -> Bool -> (Settings, KeyBindings)
    mergeConf Options{..} UserSettings{..} noColor =
@@ -176,7 +176,7 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
           -- create ~/.ghcup dir
           ensureDirectories dirs
 
-          (settings, keybindings) <- toSettings opt
+          (settings, keybindings, userConf) <- toSettings opt
 
           -- logger interpreter
           logfile <- runReaderT initGHCupFileLogging dirs
@@ -240,7 +240,7 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
                   _
                     | Just False <- optVerbose -> pure ()
                     | otherwise -> lookupEnv "GHCUP_SKIP_UPDATE_CHECK" >>= \case
-                         Nothing -> void . flip runReaderT s' . runE @'[TagNotFound, NextVerNotFound, NoToolVersionSet] $ do
+                         Nothing -> void . flip runReaderT s' . runE @'[TagNotFound, DayNotFound, NextVerNotFound, NoToolVersionSet] $ do
                            newTools <- lift checkForUpdates
                            forM_ newTools $ \newTool@(t, l) -> do
                              -- https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/283
@@ -249,7 +249,7 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
                                case t of
                                  GHCup -> runLogger $
                                             logWarn ("New GHCup version available: "
-                                              <> prettyVer l
+                                              <> tVerToText l
                                               <> ". To upgrade, run 'ghcup upgrade'")
                                  _ -> runLogger $
                                         logWarn ("New "
@@ -258,7 +258,7 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
                                           <> "If you want to install this latest version, run 'ghcup install "
                                           <> T.pack (prettyShow t)
                                           <> " "
-                                          <> prettyVer l
+                                          <> tVerToText l
                                           <> "'")
                          Just _ -> pure ()
 
@@ -303,7 +303,7 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
             Rm rmCommand               -> rm rmCommand runAppState runLogger
             DInfo                      -> dinfo runAppState runLogger
             Compile compileCommand     -> compile compileCommand settings dirs runAppState runLogger
-            Config configCommand       -> config configCommand settings keybindings runLogger
+            Config configCommand       -> config configCommand settings userConf keybindings runLogger
             Whereis whereisOptions
                     whereisCommand     -> whereis whereisCommand whereisOptions runAppState leanAppstate runLogger
             Upgrade uOpts force' fatal -> upgrade uOpts force' fatal dirs runAppState runLogger
@@ -332,9 +332,10 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
                        , MonadCatch m
                        )
                     => Command
-                    -> (Tool, Version)
+                    -> (Tool, GHCTargetVersion)
                     -> Excepts
                          '[ TagNotFound
+                          , DayNotFound
                           , NextVerNotFound
                           , NoToolVersionSet
                           ] m Bool
@@ -367,12 +368,13 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
           )
        => Tool
        -> Maybe ToolVersion
-       -> Version
+       -> GHCTargetVersion
        -> Excepts
             '[ TagNotFound
+             , DayNotFound
              , NextVerNotFound
              , NoToolVersionSet
              ] m Bool
   cmp' tool instVer ver = do
     (v, _) <- liftE $ fromVersion instVer tool
-    pure (v == mkTVer ver)
+    pure (v == ver)

cabal.ghc8107.project

@@ -5,17 +5,10 @@ optional-packages: ./vendored/*/*.cabal
 optimization: 2
 
 package ghcup
-    tests: True
     flags: +tui
 
-source-repository-package
-  type: git
-  location: https://github.com/bgamari/terminal-size.git
-  tag: 34ea816bd63f75f800eedac12c6908c6f3736036
-
 constraints: http-io-streams -brotli,
-             any.Cabal ==3.6.2.0,
-             any.aeson >= 2.0.1.0,
+             any.aeson >= 2.0.1.0
 
 package libarchive
   flags: -system-libarchive
@@ -32,6 +25,5 @@ package aeson
 package streamly
   flags: +use-unliftio
 
-allow-newer: base, ghc-prim, template-haskell, language-c
 
 with-compiler: ghc-8.10.7

cabal.ghc8107.project.freeze

@@ -1,8 +1,9 @@
 active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.6.2.0,
+constraints: any.Cabal ==3.6.3.0,
              Cabal -bundled-binary-generic,
+             any.Cabal-syntax ==3.8.1.0,
              any.HUnit ==1.6.2.0,
-             any.HsOpenSSL ==0.11.7.2,
+             any.HsOpenSSL ==0.11.7.4,
              HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
              any.OneTuple ==0.3.1,
              any.QuickCheck ==2.14.2,
@@ -10,13 +11,13 @@ constraints: any.Cabal ==3.6.2.0,
              any.StateVar ==1.2.2,
              any.abstract-deque ==0.3,
              abstract-deque -usecas,
-             any.aeson ==2.0.3.0,
+             any.aeson ==2.1.1.0,
              aeson -cffi +ordered-keymap,
              any.aeson-pretty ==0.8.9,
              aeson-pretty +lib-only,
              any.alex ==3.2.7.1,
-             any.ansi-terminal ==0.11.3,
-             ansi-terminal -example,
+             any.ansi-terminal ==0.11.4,
+             ansi-terminal -example +win32-2-13-1,
              any.ansi-wl-pprint ==0.6.9,
              ansi-wl-pprint -example,
              any.array ==0.5.4.0,
@@ -28,23 +29,27 @@ constraints: any.Cabal ==3.6.2.0,
              any.attoparsec ==0.14.4,
              attoparsec -developer,
              any.base ==4.14.3.0,
-             any.base-compat ==0.12.1,
-             any.base-compat-batteries ==0.12.1,
-             any.base-orphans ==0.8.6,
+             any.base-compat ==0.12.2,
+             any.base-compat-batteries ==0.12.2,
+             any.base-orphans ==0.8.7,
              any.base16-bytestring ==1.0.2.0,
              any.base64-bytestring ==1.2.1.0,
-             any.bifunctors ==5.5.12,
+             any.bifunctors ==5.5.14,
              bifunctors +semigroups +tagged,
+             any.bimap ==0.5.0,
              any.binary ==0.8.8.0,
+             any.binary-instances ==1.0.3,
+             any.binary-orphans ==1.0.3,
              any.blaze-builder ==0.4.2.2,
-             any.brick ==0.64.2,
+             any.brick ==1.5,
              brick -demos,
              any.bytestring ==0.10.12.0,
              any.bz2 ==1.0.1.0,
              bz2 -cross +with-bzlib,
              any.c2hs ==0.28.8,
              c2hs +base3 -regression,
-             any.cabal-plan ==0.7.2.1,
+             any.cabal-install-parsers ==0.5,
+             any.cabal-plan ==0.7.2.3,
              cabal-plan -_ -exe -license-report,
              any.call-stack ==0.4.0,
              any.case-insensitive ==1.2.1.0,
@@ -52,14 +57,12 @@ constraints: any.Cabal ==3.6.2.0,
              any.chs-cabal ==0.1.1.1,
              any.chs-deps ==0.1.0.0,
              chs-deps -cross,
-             any.clock ==0.8.3,
-             clock -llvm,
              any.colour ==2.3.6,
              any.comonad ==5.0.8,
              comonad +containers +distributive +indexed-traversable,
              any.composition-prelude ==3.0.0.2,
              composition-prelude -development,
-             any.config-ini ==0.2.4.0,
+             any.config-ini ==0.2.5.0,
              config-ini -enable-doctests,
              any.containers ==0.6.5.1,
              any.contravariant ==1.5.5,
@@ -69,6 +72,7 @@ constraints: any.Cabal ==3.6.2.0,
              any.cryptohash-sha1 ==0.11.101.0,
              any.cryptohash-sha256 ==0.11.102.1,
              cryptohash-sha256 -exe +use-cbits,
+             any.data-array-byte ==0.1.0.1,
              any.data-clist ==0.2,
              any.data-fix ==0.3.2,
              any.deepseq ==1.4.4.0,
@@ -80,58 +84,57 @@ constraints: any.Cabal ==3.6.2.0,
              dlist -werror,
              any.exceptions ==0.10.4,
              any.filepath ==1.4.2.1,
-             any.free ==5.1.8,
+             any.free ==5.1.10,
              any.fusion-plugin-types ==0.1.0,
              any.generic-arbitrary ==0.2.2,
-             any.ghc ==8.10.7,
-             any.ghc-boot ==8.10.7,
+             any.generically ==0.1,
              any.ghc-boot-th ==8.10.7,
              any.ghc-byteorder ==4.11.0.0.10,
-             any.ghc-heap ==8.10.7,
              any.ghc-prim ==0.6.1,
-             any.ghci ==8.10.7,
              any.happy ==1.20.0,
-             any.hashable ==1.4.0.2,
-             hashable +containers +integer-gmp -random-initial-seed,
+             any.hashable ==1.4.2.0,
+             hashable +integer-gmp -random-initial-seed,
+             any.haskell-lexer ==1.1.1,
              any.haskus-utils-data ==1.4,
              any.haskus-utils-types ==1.5.1,
              any.haskus-utils-variant ==3.2.1,
              any.heaps ==0.4,
-             any.hpc ==0.6.1.0,
              any.hsc2hs ==0.68.8,
              hsc2hs -in-ghc-tree,
-             any.hspec ==2.9.7,
-             any.hspec-core ==2.9.7,
-             any.hspec-discover ==2.9.7,
+             any.hspec ==2.10.8,
+             any.hspec-core ==2.10.8,
+             any.hspec-discover ==2.10.8,
              any.hspec-expectations ==0.8.2,
              any.hspec-golden-aeson ==0.9.0.0,
              any.http-io-streams ==0.1.6.1,
              http-io-streams -brotli +fast-xor,
              any.indexed-profunctors ==0.1.1,
              any.indexed-traversable ==0.1.2,
-             any.indexed-traversable-instances ==0.1.1,
+             any.indexed-traversable-instances ==0.1.1.1,
              any.integer-gmp ==1.0.3.0,
              any.integer-logarithms ==1.0.3.1,
              integer-logarithms -check-bounds +integer-gmp,
-             any.io-streams ==1.5.2.1,
+             any.io-streams ==1.5.2.2,
              io-streams +network -nointeractivetests +zlib,
-             any.language-c ==0.9.1,
+             any.language-c ==0.9.2,
              language-c -allwarnings +iecfpextension +usebytestrings,
              any.libarchive ==3.0.3.2,
              libarchive -cross -low-memory +no-exe -system-libarchive,
              any.libyaml-streamly ==0.2.1,
              libyaml-streamly -no-unicode -system-libyaml,
-             any.lockfree-queue ==0.2.3.1,
-             any.lzma-static ==5.2.5.4,
+             any.lockfree-queue ==0.2.4,
+             any.lukko ==0.1.1.3,
+             lukko +ofd-locking,
+             any.lzma-static ==5.2.5.5,
              any.megaparsec ==9.2.1,
              megaparsec -dev,
-             any.microlens ==0.4.12.0,
-             any.microlens-mtl ==0.2.0.2,
-             any.microlens-th ==0.4.3.10,
+             any.microlens ==0.4.13.1,
+             any.microlens-mtl ==0.2.0.3,
+             any.microlens-th ==0.4.3.11,
              any.mtl ==2.2.2,
              any.network ==3.1.2.7,
              network -devel,
-             any.network-uri ==2.6.4.1,
+             any.network-uri ==2.6.4.2,
              any.openssl-streams ==1.2.3.0,
              any.optics ==0.4.2,
              any.optics-core ==0.4.1,
@@ -143,7 +146,7 @@ constraints: any.Cabal ==3.6.2.0,
              any.os-release ==1.0.2.1,
              os-release -devel,
              any.parallel ==3.2.2.0,
-             any.parsec ==3.1.14.0,
+             any.parsec ==3.1.16.1,
              any.parser-combinators ==1.3.0,
              parser-combinators -dev,
              any.polyparse ==1.13,
@@ -155,12 +158,12 @@ constraints: any.Cabal ==3.6.2.0,
              any.quickcheck-arbitrary-adt ==0.3.1.0,
              any.quickcheck-io ==0.2.0,
              any.random ==1.2.1.1,
-             any.recursion-schemes ==5.2.2.2,
+             any.recursion-schemes ==5.2.2.3,
              recursion-schemes +template-haskell,
              any.regex-base ==0.94.0.2,
              any.regex-posix ==0.96.0.1,
              regex-posix -_regex-posix-clib,
-             any.resourcet ==1.2.5,
+             any.resourcet ==1.2.6,
              any.retry ==0.8.1.2,
              retry -lib-werror,
              any.rts ==1.0.1,
@@ -173,11 +176,11 @@ constraints: any.Cabal ==3.6.2.0,
              any.semigroupoids ==5.3.7,
              semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
              any.setenv ==0.1.1.3,
-             any.split ==0.2.3.4,
+             any.split ==0.2.3.5,
              any.splitmix ==0.1.0.4,
              splitmix -optimised-mixer,
              any.stm ==2.5.0.1,
-             any.streamly ==0.8.2,
+             any.streamly ==0.8.3,
              streamly -debug -dev -fusion-plugin -has-llvm -inspection -limit-build-mem -no-fusion +opt -streamk -streamly-core -use-c-malloc +use-unliftio,
              any.strict ==0.4.0.1,
              strict +assoc,
@@ -185,20 +188,24 @@ constraints: any.Cabal ==3.6.2.0,
              any.tagged ==0.8.6.1,
              tagged +deepseq +transformers,
              any.tagsoup ==0.14.8,
+             any.tar ==0.5.1.1,
+             tar -old-bytestring -old-time,
              any.template-haskell ==2.16.0.0,
              any.temporary ==1.3,
              any.terminal-progress-bar ==0.4.1,
-             any.terminal-size ==0.3.2.1,
+             any.terminal-size ==0.3.3,
              any.terminfo ==0.4.1.4,
-             any.text ==1.2.4.1,
+             any.text ==2.0.1,
+             text -developer +simdutf,
+             any.text-binary ==0.2.1.1,
              any.text-short ==0.1.5,
              text-short -asserts,
-             any.text-zipper ==0.11,
+             any.text-zipper ==0.12,
              any.tf-random ==0.5,
-             any.th-abstraction ==0.4.3.0,
-             any.th-compat ==0.1.3,
+             any.th-abstraction ==0.4.5.0,
+             any.th-compat ==0.1.4,
              any.th-lift ==0.8.2,
-             any.th-lift-instances ==0.1.19,
+             any.th-lift-instances ==0.1.20,
              any.these ==1.1.1.1,
              these +assoc,
              any.time ==1.9.3,
@@ -207,12 +214,12 @@ constraints: any.Cabal ==3.6.2.0,
              any.transformers ==0.5.6.2,
              any.transformers-base ==0.4.6,
              transformers-base +orphaninstances,
-             any.transformers-compat ==0.7.1,
+             any.transformers-compat ==0.7.2,
              transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
-             any.unicode-data ==0.3.0,
+             any.unicode-data ==0.3.1,
              unicode-data -ucd2haskell,
              any.unix ==2.7.2.2,
-             any.unix-bytestring ==0.3.7.7,
+             any.unix-bytestring ==0.3.7.8,
              any.unix-compat ==0.6,
              unix-compat -old-time,
              any.unliftio-core ==0.2.0.1,
@@ -224,8 +231,9 @@ constraints: any.Cabal ==3.6.2.0,
              any.uuid-types ==1.0.5,
              any.vector ==0.12.3.1,
              vector +boundschecks -internalchecks -unsafechecks -wall,
-             any.versions ==5.0.3,
-             any.vty ==5.33,
+             any.vector-binary-instances ==0.2.5.2,
+             any.versions ==5.0.4,
+             any.vty ==5.37,
              any.witherable ==0.4.2,
              any.word-wrap ==0.5,
              any.word8 ==0.1.3,
@@ -235,4 +243,4 @@ constraints: any.Cabal ==3.6.2.0,
              any.zlib ==0.6.3.0,
              zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
              any.zlib-bindings ==0.1.1.5
-index-state: hackage.haskell.org 2022-06-04T19:47:01Z
+index-state: hackage.haskell.org 2023-01-12T04:22:48Z

cabal.ghc902.project

@@ -1,37 +0,0 @@
-packages: ./ghcup.cabal
-
-optional-packages: ./vendored/*/*.cabal
-
-optimization: 2
-
-package ghcup
-    tests: True
-    flags: +tui
-
-source-repository-package
-  type: git
-  location: https://github.com/bgamari/terminal-size.git
-  tag: 34ea816bd63f75f800eedac12c6908c6f3736036
-
-constraints: http-io-streams -brotli,
-             any.Cabal ==3.6.2.0,
-             any.aeson >= 2.0.1.0,
-
-package libarchive
-  flags: -system-libarchive
-
-package aeson-pretty
-  flags: +lib-only
-
-package cabal-plan
-  flags: -exe
-
-package aeson
-  flags: +ordered-keymap
-
-package streamly
-  flags: +use-unliftio
-
-allow-newer: base, ghc-prim, template-haskell, language-c
-
-with-compiler: ghc-9.0.2

cabal.ghc902.project.freeze

@@ -1,238 +0,0 @@
-active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.6.2.0,
-             Cabal -bundled-binary-generic,
-             any.HUnit ==1.6.2.0,
-             any.HsOpenSSL ==0.11.7.2,
-             HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
-             any.OneTuple ==0.3.1,
-             any.QuickCheck ==2.14.2,
-             QuickCheck -old-random +templatehaskell,
-             any.StateVar ==1.2.2,
-             any.abstract-deque ==0.3,
-             abstract-deque -usecas,
-             any.aeson ==2.0.3.0,
-             aeson -cffi +ordered-keymap,
-             any.aeson-pretty ==0.8.9,
-             aeson-pretty +lib-only,
-             any.alex ==3.2.7.1,
-             any.ansi-terminal ==0.11.3,
-             ansi-terminal -example,
-             any.ansi-wl-pprint ==0.6.9,
-             ansi-wl-pprint -example,
-             any.array ==0.5.4.0,
-             any.assoc ==1.0.2,
-             any.async ==2.2.4,
-             async -bench,
-             any.atomic-primops ==0.8.4,
-             atomic-primops -debug,
-             any.attoparsec ==0.14.4,
-             attoparsec -developer,
-             any.base ==4.15.1.0,
-             any.base-compat ==0.12.1,
-             any.base-compat-batteries ==0.12.1,
-             any.base-orphans ==0.8.6,
-             any.base16-bytestring ==1.0.2.0,
-             any.base64-bytestring ==1.2.1.0,
-             any.bifunctors ==5.5.12,
-             bifunctors +semigroups +tagged,
-             any.binary ==0.8.8.0,
-             any.blaze-builder ==0.4.2.2,
-             any.brick ==0.64.2,
-             brick -demos,
-             any.bytestring ==0.10.12.1,
-             any.bz2 ==1.0.1.0,
-             bz2 -cross +with-bzlib,
-             any.c2hs ==0.28.8,
-             c2hs +base3 -regression,
-             any.cabal-plan ==0.7.2.1,
-             cabal-plan -_ -exe -license-report,
-             any.call-stack ==0.4.0,
-             any.case-insensitive ==1.2.1.0,
-             any.casing ==0.1.4.1,
-             any.chs-cabal ==0.1.1.1,
-             any.chs-deps ==0.1.0.0,
-             chs-deps -cross,
-             any.clock ==0.8.3,
-             clock -llvm,
-             any.colour ==2.3.6,
-             any.comonad ==5.0.8,
-             comonad +containers +distributive +indexed-traversable,
-             any.composition-prelude ==3.0.0.2,
-             composition-prelude -development,
-             any.config-ini ==0.2.4.0,
-             config-ini -enable-doctests,
-             any.containers ==0.6.4.1,
-             any.contravariant ==1.5.5,
-             contravariant +semigroups +statevar +tagged,
-             any.cpphs ==1.20.9.1,
-             cpphs -old-locale,
-             any.cryptohash-sha1 ==0.11.101.0,
-             any.cryptohash-sha256 ==0.11.102.1,
-             cryptohash-sha256 -exe +use-cbits,
-             any.data-clist ==0.2,
-             any.data-fix ==0.3.2,
-             any.deepseq ==1.4.5.0,
-             any.directory ==1.3.6.2,
-             any.disk-free-space ==0.1.0.1,
-             any.distributive ==0.6.2.1,
-             distributive +semigroups +tagged,
-             any.dlist ==1.0,
-             dlist -werror,
-             any.exceptions ==0.10.4,
-             any.filepath ==1.4.2.1,
-             any.free ==5.1.8,
-             any.fusion-plugin-types ==0.1.0,
-             any.generic-arbitrary ==0.2.2,
-             any.ghc ==9.0.2,
-             any.ghc-bignum ==1.1,
-             any.ghc-boot ==9.0.2,
-             any.ghc-boot-th ==9.0.2,
-             any.ghc-byteorder ==4.11.0.0.10,
-             any.ghc-heap ==9.0.2,
-             any.ghc-prim ==0.7.0,
-             any.ghci ==9.0.2,
-             any.happy ==1.20.0,
-             any.hashable ==1.4.0.2,
-             hashable +containers +integer-gmp -random-initial-seed,
-             any.haskus-utils-data ==1.4,
-             any.haskus-utils-types ==1.5.1,
-             any.haskus-utils-variant ==3.2.1,
-             any.heaps ==0.4,
-             any.hpc ==0.6.1.0,
-             any.hsc2hs ==0.68.8,
-             hsc2hs -in-ghc-tree,
-             any.hspec ==2.9.7,
-             any.hspec-core ==2.9.7,
-             any.hspec-discover ==2.9.7,
-             any.hspec-expectations ==0.8.2,
-             any.hspec-golden-aeson ==0.9.0.0,
-             any.http-io-streams ==0.1.6.1,
-             http-io-streams -brotli +fast-xor,
-             any.indexed-profunctors ==0.1.1,
-             any.indexed-traversable ==0.1.2,
-             any.indexed-traversable-instances ==0.1.1,
-             any.integer-logarithms ==1.0.3.1,
-             integer-logarithms -check-bounds +integer-gmp,
-             any.io-streams ==1.5.2.1,
-             io-streams +network -nointeractivetests +zlib,
-             any.language-c ==0.9.1,
-             language-c -allwarnings +iecfpextension +usebytestrings,
-             any.libarchive ==3.0.3.2,
-             libarchive -cross -low-memory +no-exe -system-libarchive,
-             any.libyaml-streamly ==0.2.1,
-             libyaml-streamly -no-unicode -system-libyaml,
-             any.lockfree-queue ==0.2.3.1,
-             any.lzma-static ==5.2.5.4,
-             any.megaparsec ==9.2.1,
-             megaparsec -dev,
-             any.microlens ==0.4.12.0,
-             any.microlens-mtl ==0.2.0.2,
-             any.microlens-th ==0.4.3.10,
-             any.mtl ==2.2.2,
-             any.network ==3.1.2.7,
-             network -devel,
-             any.network-uri ==2.6.4.1,
-             any.openssl-streams ==1.2.3.0,
-             any.optics ==0.4.2,
-             any.optics-core ==0.4.1,
-             optics-core -explicit-generic-labels,
-             any.optics-extra ==0.4.2.1,
-             any.optics-th ==0.4.1,
-             any.optparse-applicative ==0.17.0.0,
-             optparse-applicative +process,
-             any.os-release ==1.0.2.1,
-             os-release -devel,
-             any.parallel ==3.2.2.0,
-             any.parsec ==3.1.14.0,
-             any.parser-combinators ==1.3.0,
-             parser-combinators -dev,
-             any.polyparse ==1.13,
-             any.pretty ==1.1.3.6,
-             any.pretty-terminal ==0.1.0.0,
-             any.primitive ==0.7.4.0,
-             any.process ==1.6.13.2,
-             any.profunctors ==5.6.2,
-             any.quickcheck-arbitrary-adt ==0.3.1.0,
-             any.quickcheck-io ==0.2.0,
-             any.random ==1.2.1.1,
-             any.recursion-schemes ==5.2.2.2,
-             recursion-schemes +template-haskell,
-             any.regex-base ==0.94.0.2,
-             any.regex-posix ==0.96.0.1,
-             regex-posix -_regex-posix-clib,
-             any.resourcet ==1.2.5,
-             any.retry ==0.8.1.2,
-             retry -lib-werror,
-             any.rts ==1.0.2,
-             any.safe ==0.3.19,
-             any.safe-exceptions ==0.1.7.3,
-             any.scientific ==0.3.7.0,
-             scientific -bytestring-builder -integer-simple,
-             any.semialign ==1.2.0.1,
-             semialign +semigroupoids,
-             any.semigroupoids ==5.3.7,
-             semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
-             any.setenv ==0.1.1.3,
-             any.split ==0.2.3.4,
-             any.splitmix ==0.1.0.4,
-             splitmix -optimised-mixer,
-             any.stm ==2.5.0.0,
-             any.streamly ==0.8.2,
-             streamly -debug -dev -fusion-plugin -has-llvm -inspection -limit-build-mem -no-fusion +opt -streamk -streamly-core -use-c-malloc +use-unliftio,
-             any.strict ==0.4.0.1,
-             strict +assoc,
-             any.strict-base ==0.4.0.0,
-             any.tagged ==0.8.6.1,
-             tagged +deepseq +transformers,
-             any.tagsoup ==0.14.8,
-             any.template-haskell ==2.17.0.0,
-             any.temporary ==1.3,
-             any.terminal-progress-bar ==0.4.1,
-             any.terminal-size ==0.3.2.1,
-             any.terminfo ==0.4.1.5,
-             any.text ==1.2.5.0,
-             any.text-short ==0.1.5,
-             text-short -asserts,
-             any.text-zipper ==0.11,
-             any.tf-random ==0.5,
-             any.th-abstraction ==0.4.3.0,
-             any.th-compat ==0.1.3,
-             any.th-lift ==0.8.2,
-             any.th-lift-instances ==0.1.19,
-             any.these ==1.1.1.1,
-             these +assoc,
-             any.time ==1.9.3,
-             any.time-compat ==1.9.6.1,
-             time-compat -old-locale,
-             any.transformers ==0.5.6.2,
-             any.transformers-base ==0.4.6,
-             transformers-base +orphaninstances,
-             any.transformers-compat ==0.7.1,
-             transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
-             any.unicode-data ==0.3.0,
-             unicode-data -ucd2haskell,
-             any.unix ==2.7.2.2,
-             any.unix-bytestring ==0.3.7.7,
-             any.unix-compat ==0.6,
-             unix-compat -old-time,
-             any.unliftio-core ==0.2.0.1,
-             any.unordered-containers ==0.2.19.1,
-             unordered-containers -debug,
-             any.uri-bytestring ==0.3.3.1,
-             uri-bytestring -lib-werror,
-             any.utf8-string ==1.0.2,
-             any.uuid-types ==1.0.5,
-             any.vector ==0.12.3.1,
-             vector +boundschecks -internalchecks -unsafechecks -wall,
-             any.versions ==5.0.3,
-             any.vty ==5.33,
-             any.witherable ==0.4.2,
-             any.word-wrap ==0.5,
-             any.word8 ==0.1.3,
-             any.xor ==0.0.1.1,
-             any.yaml-streamly ==0.12.1,
-             yaml-streamly +no-examples +no-exe,
-             any.zlib ==0.6.3.0,
-             zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
-             any.zlib-bindings ==0.1.1.5
-index-state: hackage.haskell.org 2022-06-04T19:47:01Z

cabal.ghc923.project

@@ -1,37 +0,0 @@
-packages: ./ghcup.cabal
-
-optional-packages: ./vendored/*/*.cabal
-
-optimization: 2
-
-package ghcup
-    tests: True
-    flags: +tui
-
-source-repository-package
-  type: git
-  location: https://github.com/bgamari/terminal-size.git
-  tag: 34ea816bd63f75f800eedac12c6908c6f3736036
-
-constraints: http-io-streams -brotli,
-             any.Cabal ==3.6.2.0,
-             any.aeson >= 2.0.1.0,
-
-package libarchive
-  flags: -system-libarchive
-
-package aeson-pretty
-  flags: +lib-only
-
-package cabal-plan
-  flags: -exe
-
-package aeson
-  flags: +ordered-keymap
-
-package streamly
-  flags: +use-unliftio
-
-allow-newer: base, ghc-prim, template-haskell, language-c
-
-with-compiler: ghc-9.2.3

cabal.ghc923.project.freeze

@@ -1,233 +0,0 @@
-active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.6.2.0,
-             Cabal -bundled-binary-generic,
-             any.HUnit ==1.6.2.0,
-             any.HsOpenSSL ==0.11.7.2,
-             HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
-             any.OneTuple ==0.3.1,
-             any.QuickCheck ==2.14.2,
-             QuickCheck -old-random +templatehaskell,
-             any.StateVar ==1.2.2,
-             any.abstract-deque ==0.3,
-             abstract-deque -usecas,
-             any.aeson ==2.0.3.0,
-             aeson -cffi +ordered-keymap,
-             any.aeson-pretty ==0.8.9,
-             aeson-pretty +lib-only,
-             any.alex ==3.2.7.1,
-             any.ansi-terminal ==0.11.3,
-             ansi-terminal -example,
-             any.ansi-wl-pprint ==0.6.9,
-             ansi-wl-pprint -example,
-             any.array ==0.5.4.0,
-             any.assoc ==1.0.2,
-             any.async ==2.2.4,
-             async -bench,
-             any.atomic-primops ==0.8.4,
-             atomic-primops -debug,
-             any.attoparsec ==0.14.4,
-             attoparsec -developer,
-             any.base ==4.16.2.0,
-             any.base-compat ==0.12.1,
-             any.base-compat-batteries ==0.12.1,
-             any.base-orphans ==0.8.6,
-             any.base16-bytestring ==1.0.2.0,
-             any.base64-bytestring ==1.2.1.0,
-             any.bifunctors ==5.5.12,
-             bifunctors +semigroups +tagged,
-             any.binary ==0.8.9.0,
-             any.blaze-builder ==0.4.2.2,
-             any.brick ==0.64.2,
-             brick -demos,
-             any.bytestring ==0.11.3.1,
-             any.bz2 ==1.0.1.0,
-             bz2 -cross +with-bzlib,
-             any.c2hs ==0.28.8,
-             c2hs +base3 -regression,
-             any.cabal-plan ==0.7.2.1,
-             cabal-plan -_ -exe -license-report,
-             any.call-stack ==0.4.0,
-             any.case-insensitive ==1.2.1.0,
-             any.casing ==0.1.4.1,
-             any.chs-cabal ==0.1.1.1,
-             any.chs-deps ==0.1.0.0,
-             chs-deps -cross,
-             any.clock ==0.8.3,
-             clock -llvm,
-             any.colour ==2.3.6,
-             any.comonad ==5.0.8,
-             comonad +containers +distributive +indexed-traversable,
-             any.composition-prelude ==3.0.0.2,
-             composition-prelude -development,
-             any.config-ini ==0.2.4.0,
-             config-ini -enable-doctests,
-             any.containers ==0.6.5.1,
-             any.contravariant ==1.5.5,
-             contravariant +semigroups +statevar +tagged,
-             any.cpphs ==1.20.9.1,
-             cpphs -old-locale,
-             any.cryptohash-sha1 ==0.11.101.0,
-             any.cryptohash-sha256 ==0.11.102.1,
-             cryptohash-sha256 -exe +use-cbits,
-             any.data-clist ==0.2,
-             any.data-fix ==0.3.2,
-             any.deepseq ==1.4.6.1,
-             any.directory ==1.3.7.0,
-             any.disk-free-space ==0.1.0.1,
-             any.distributive ==0.6.2.1,
-             distributive +semigroups +tagged,
-             any.dlist ==1.0,
-             dlist -werror,
-             any.exceptions ==0.10.4,
-             any.filepath ==1.4.2.2,
-             any.free ==5.1.8,
-             any.fusion-plugin-types ==0.1.0,
-             any.generic-arbitrary ==0.2.2,
-             any.ghc-bignum ==1.2,
-             any.ghc-boot-th ==9.2.3,
-             any.ghc-byteorder ==4.11.0.0.10,
-             any.ghc-prim ==0.8.0,
-             any.happy ==1.20.0,
-             any.hashable ==1.4.0.2,
-             hashable +containers +integer-gmp -random-initial-seed,
-             any.haskus-utils-data ==1.4,
-             any.haskus-utils-types ==1.5.1,
-             any.haskus-utils-variant ==3.2.1,
-             any.heaps ==0.4,
-             any.hsc2hs ==0.68.8,
-             hsc2hs -in-ghc-tree,
-             any.hspec ==2.9.2,
-             any.hspec-core ==2.9.2,
-             any.hspec-discover ==2.9.2,
-             any.hspec-expectations ==0.8.2,
-             any.hspec-golden-aeson ==0.9.0.0,
-             any.http-io-streams ==0.1.6.1,
-             http-io-streams -brotli +fast-xor,
-             any.indexed-profunctors ==0.1.1,
-             any.indexed-traversable ==0.1.2,
-             any.indexed-traversable-instances ==0.1.1,
-             any.integer-logarithms ==1.0.3.1,
-             integer-logarithms -check-bounds +integer-gmp,
-             any.io-streams ==1.5.2.1,
-             io-streams +network -nointeractivetests +zlib,
-             any.language-c ==0.9.1,
-             language-c -allwarnings +iecfpextension +usebytestrings,
-             any.libarchive ==3.0.3.2,
-             libarchive -cross -low-memory +no-exe -system-libarchive,
-             any.libyaml-streamly ==0.2.1,
-             libyaml-streamly -no-unicode -system-libyaml,
-             any.lockfree-queue ==0.2.3.1,
-             any.lzma-static ==5.2.5.4,
-             any.megaparsec ==9.2.1,
-             megaparsec -dev,
-             any.microlens ==0.4.12.0,
-             any.microlens-mtl ==0.2.0.2,
-             any.microlens-th ==0.4.3.10,
-             any.mtl ==2.2.2,
-             any.network ==3.1.2.7,
-             network -devel,
-             any.network-uri ==2.6.4.1,
-             any.openssl-streams ==1.2.3.0,
-             any.optics ==0.4.2,
-             any.optics-core ==0.4.1,
-             optics-core -explicit-generic-labels,
-             any.optics-extra ==0.4.2.1,
-             any.optics-th ==0.4.1,
-             any.optparse-applicative ==0.17.0.0,
-             optparse-applicative +process,
-             any.os-release ==1.0.2.1,
-             os-release -devel,
-             any.parallel ==3.2.2.0,
-             any.parsec ==3.1.15.0,
-             any.parser-combinators ==1.3.0,
-             parser-combinators -dev,
-             any.polyparse ==1.13,
-             any.pretty ==1.1.3.6,
-             any.pretty-terminal ==0.1.0.0,
-             any.primitive ==0.7.4.0,
-             any.process ==1.6.14.0,
-             any.profunctors ==5.6.2,
-             any.quickcheck-arbitrary-adt ==0.3.1.0,
-             any.quickcheck-io ==0.2.0,
-             any.random ==1.2.1.1,
-             any.recursion-schemes ==5.2.2.2,
-             recursion-schemes +template-haskell,
-             any.regex-base ==0.94.0.2,
-             any.regex-posix ==0.96.0.1,
-             regex-posix -_regex-posix-clib,
-             any.resourcet ==1.2.5,
-             any.retry ==0.8.1.2,
-             retry -lib-werror,
-             any.rts ==1.0.2,
-             any.safe ==0.3.19,
-             any.safe-exceptions ==0.1.7.3,
-             any.scientific ==0.3.7.0,
-             scientific -bytestring-builder -integer-simple,
-             any.semialign ==1.2.0.1,
-             semialign +semigroupoids,
-             any.semigroupoids ==5.3.7,
-             semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
-             any.setenv ==0.1.1.3,
-             any.split ==0.2.3.4,
-             any.splitmix ==0.1.0.4,
-             splitmix -optimised-mixer,
-             any.stm ==2.5.0.2,
-             any.streamly ==0.8.2,
-             streamly -debug -dev -fusion-plugin -has-llvm -inspection -limit-build-mem -no-fusion +opt -streamk -streamly-core -use-c-malloc +use-unliftio,
-             any.strict ==0.4.0.1,
-             strict +assoc,
-             any.strict-base ==0.4.0.0,
-             any.tagged ==0.8.6.1,
-             tagged +deepseq +transformers,
-             any.tagsoup ==0.14.8,
-             any.template-haskell ==2.18.0.0,
-             any.temporary ==1.3,
-             any.terminal-progress-bar ==0.4.1,
-             any.terminal-size ==0.3.2.1,
-             any.terminfo ==0.4.1.5,
-             any.text ==1.2.5.0,
-             any.text-short ==0.1.5,
-             text-short -asserts,
-             any.text-zipper ==0.11,
-             any.tf-random ==0.5,
-             any.th-abstraction ==0.4.3.0,
-             any.th-compat ==0.1.3,
-             any.th-lift ==0.8.2,
-             any.th-lift-instances ==0.1.19,
-             any.these ==1.1.1.1,
-             these +assoc,
-             any.time ==1.9.3,
-             any.time-compat ==1.9.6.1,
-             time-compat -old-locale,
-             any.transformers ==0.5.6.2,
-             any.transformers-base ==0.4.6,
-             transformers-base +orphaninstances,
-             any.transformers-compat ==0.7.1,
-             transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
-             any.unicode-data ==0.3.0,
-             unicode-data -ucd2haskell,
-             any.unix ==2.7.2.2,
-             any.unix-bytestring ==0.3.7.7,
-             any.unix-compat ==0.6,
-             unix-compat -old-time,
-             any.unliftio-core ==0.2.0.1,
-             any.unordered-containers ==0.2.19.1,
-             unordered-containers -debug,
-             any.uri-bytestring ==0.3.3.1,
-             uri-bytestring -lib-werror,
-             any.utf8-string ==1.0.2,
-             any.uuid-types ==1.0.5,
-             any.vector ==0.12.3.1,
-             vector +boundschecks -internalchecks -unsafechecks -wall,
-             any.versions ==5.0.3,
-             any.vty ==5.33,
-             any.witherable ==0.4.2,
-             any.word-wrap ==0.5,
-             any.word8 ==0.1.3,
-             any.xor ==0.0.1.1,
-             any.yaml-streamly ==0.12.1,
-             yaml-streamly +no-examples +no-exe,
-             any.zlib ==0.6.3.0,
-             zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
-             any.zlib-bindings ==0.1.1.5
-index-state: hackage.haskell.org 2022-06-04T19:47:01Z

cabal.project

@@ -2,8 +2,6 @@ packages: ./ghcup.cabal
 
 optional-packages: ./vendored/*/*.cabal
 
-optimization: 2
-
 package ghcup
     flags: +tui
 
@@ -25,3 +23,5 @@ package aeson
 package streamly
   flags: +use-unliftio
 
+package *
+  test-show-details: direct

cabal.project.release

@@ -0,0 +1,50 @@
+packages: ./ghcup.cabal
+
+optional-packages: ./vendored/*/*.cabal
+
+optimization: 2
+
+if os(linux)
+  package ghcup
+    flags: +tui
+  if arch(x86_64) || arch(i386)
+    package *
+      ghc-options: -split-sections -optl-static
+elif os(darwin)
+  constraints: zlib +bundled-c-zlib,
+               lzma +static
+  package ghcup
+    flags: +tui
+elif os(mingw32)
+  constraints: zlib +bundled-c-zlib,
+               lzma +static,
+               text -simdutf
+  package ghcup
+    flags: -tui
+elif os(freebsd)
+  constraints: zlib +bundled-c-zlib,
+               zip +disable-zstd
+  package *
+    ghc-options: -split-sections -pgmc clang++14
+  package ghcup
+    flags: +tui
+
+constraints: http-io-streams -brotli,
+             any.aeson >= 2.0.1.0,
+             any.hsc2hs ==0.68.8
+
+package libarchive
+  flags: -system-libarchive
+
+package aeson-pretty
+  flags: +lib-only
+
+package cabal-plan
+  flags: -exe
+
+package aeson
+  flags: +ordered-keymap
+
+package streamly
+  flags: +use-unliftio
+

docker/alpine32/Dockerfile

@@ -1,4 +1,4 @@
-FROM i386/alpine:3.12
+FROM --platform=linux/i386 i386/alpine:3.12
 
 ENV LANG C.UTF-8
 
@@ -37,8 +37,8 @@ RUN apk add --no-cache \
             xz-dev \
             ncurses-static
 
-ARG GHCUP_VERSION=0.1.18.0
-ARG GPG_KEY=7784930957807690A66EBDBE3786C5262ECB4A3F
+ARG GHCUP_VERSION=0.1.19.4
+ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C
 
 # install ghcup
 RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \

docker/alpine64/Dockerfile

@@ -37,8 +37,9 @@ RUN apk add --no-cache \
             xz-dev \
             ncurses-static
 
-ARG GHCUP_VERSION=0.1.18.0
-ARG GPG_KEY=7784930957807690A66EBDBE3786C5262ECB4A3F
+ARG GHCUP_VERSION=0.1.19.4
+ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C
+
 
 # install ghcup
 RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \

docker/arm32v7/buster/Dockerfile

@@ -0,0 +1,61 @@
+FROM arm32v7/debian:10
+
+ENV LANG C.UTF-8
+ENV DEBIAN_FRONTEND=noninteractive
+ENV TZ=Asia/Singapore
+
+COPY update_opt.sh /usr/bin/update_opt.sh
+RUN chmod +x /usr/bin/update_opt.sh
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        ca-certificates \
+        curl \
+        dirmngr \
+        g++ \
+        git \
+        gnupg \
+        libsqlite3-dev \
+        libtinfo-dev \
+        libgmp-dev \
+        make \
+        netbase \
+        openssh-client \
+        xz-utils \
+        zlib1g-dev \
+		libnuma-dev libgmp10 libssl-dev liblzma-dev libbz2-dev wget lsb-release software-properties-common apt-transport-https gcc autoconf automake build-essential gzip patchelf tree \
+		llvm-11 clang-11 && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN update_opt.sh 11 1
+
+ARG GHCUP_VERSION=0.1.19.4
+ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C
+
+# install ghcup
+RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \
+    curl -sSfL -O https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/armv7-linux-ghcup-$GHCUP_VERSION && \
+    curl -sSfL -O https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/SHA256SUMS && \
+    curl -sSfL -O https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/SHA256SUMS.sig && \
+    gpg --verify SHA256SUMS.sig SHA256SUMS && \
+    sha256sum -c --ignore-missing SHA256SUMS && \
+    mv armv7-linux-ghcup-$GHCUP_VERSION /usr/bin/ghcup && \
+    chmod +x /usr/bin/ghcup && \
+    rm -rf SHA256SUMS SHA256SUMS.sig
+
+ARG GHC=8.10.7
+ARG CABAL_INSTALL=3.6.2.0
+ARG STACK=2.9.1
+
+ENV GHCUP_CURL_OPTS="--silent"
+ENV NO_COLOR=1
+
+# install haskell toolchain
+RUN ghcup config set gpg-setting GPGStrict && \
+	ghcup --verbose install ghc   --isolate=/usr     --force ${GHC} && \
+	ghcup --verbose install cabal --isolate=/usr/bin --force ${CABAL_INSTALL} && \
+	ghcup gc -s -c -t
+
+ENV PATH /root/.cabal/bin:/root/.ghcup/bin:/root/.local/bin:$PATH
+
+CMD ["ghci"]

docker/arm32v7/focal/Dockerfile

@@ -29,8 +29,8 @@ RUN apt-get update && \
 
 RUN update_opt.sh 9 1
 
-ARG GHCUP_VERSION=0.1.17.8
-ARG GPG_KEY=7784930957807690A66EBDBE3786C5262ECB4A3F
+ARG GHCUP_VERSION=0.1.19.4
+ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C
 
 # install ghcup
 RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \
@@ -54,10 +54,7 @@ ENV NO_COLOR=1
 RUN ghcup config set gpg-setting GPGStrict && \
 	ghcup --verbose install ghc   --isolate=/usr     --force ${GHC} && \
 	ghcup --verbose install cabal --isolate=/usr/bin --force ${CABAL_INSTALL} && \
-	find "/usr/lib/ghc-${GHC}/" \( -name "*_p.a" -o -name "*.p_hi" \) -type f -delete && \
-	rm -r "/usr/share/doc/ghc-${GHC}" && \
-	rm -rf /tmp/ghcup* && \
-	ghcup gc -p -s -c -t
+	ghcup gc -s -c -t
 
 ENV PATH /root/.cabal/bin:/root/.ghcup/bin:/root/.local/bin:$PATH
 

docker/arm64v8/buster/Dockerfile

@@ -0,0 +1,61 @@
+FROM arm64v8/debian:10
+
+ENV LANG C.UTF-8
+ENV DEBIAN_FRONTEND=noninteractive
+ENV TZ=Asia/Singapore
+
+COPY update_opt.sh /usr/bin/update_opt.sh
+RUN chmod +x /usr/bin/update_opt.sh
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        ca-certificates \
+        curl \
+        dirmngr \
+        g++ \
+        git \
+        gnupg \
+        libsqlite3-dev \
+        libtinfo-dev \
+        libgmp-dev \
+        make \
+        netbase \
+        openssh-client \
+        xz-utils \
+        zlib1g-dev \
+		libnuma-dev libgmp10 libssl-dev liblzma-dev libbz2-dev wget lsb-release software-properties-common apt-transport-https gcc autoconf automake build-essential gzip patchelf tree \
+		llvm-11 clang-11 && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN update_opt.sh 11 1
+
+ARG GHCUP_VERSION=0.1.19.4
+ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C
+
+# install ghcup
+RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \
+    curl -sSfL -O https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/aarch64-linux-ghcup-$GHCUP_VERSION && \
+    curl -sSfL -O https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/SHA256SUMS && \
+    curl -sSfL -O https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/SHA256SUMS.sig && \
+    gpg --verify SHA256SUMS.sig SHA256SUMS && \
+    sha256sum -c --ignore-missing SHA256SUMS && \
+    mv aarch64-linux-ghcup-$GHCUP_VERSION /usr/bin/ghcup && \
+    chmod +x /usr/bin/ghcup && \
+    rm -rf SHA256SUMS SHA256SUMS.sig
+
+ARG GHC=8.10.7
+ARG CABAL_INSTALL=3.6.2.0
+ARG STACK=2.9.1
+
+ENV GHCUP_CURL_OPTS="--silent"
+ENV NO_COLOR=1
+
+# install haskell toolchain
+RUN ghcup config set gpg-setting GPGStrict && \
+	ghcup --verbose install ghc   --isolate=/usr     --force ${GHC} && \
+	ghcup --verbose install cabal --isolate=/usr/bin --force ${CABAL_INSTALL} && \
+	ghcup gc -s -c -t
+
+ENV PATH /root/.cabal/bin:/root/.ghcup/bin:/root/.local/bin:$PATH
+
+CMD ["ghci"]

docker/arm64v8/buster/update_opt.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+# update_alternatives.sh
+
+update_alternatives() {
+    local version=${1}
+    local priority=${2}
+    local master=${3}
+    local slaves=${4}
+    local path=${5}
+    local cmdln
+
+    cmdln="--verbose --install ${path}${master} ${master} ${path}${master}-${version} ${priority}"
+    for slave in ${slaves}; do
+        cmdln="${cmdln} --slave ${path}${slave} ${slave} ${path}${slave}-${version}"
+    done
+    update-alternatives ${cmdln}
+}
+
+if [[ ${#} -ne 2 ]]; then
+    echo usage: "${0}" clang_version priority
+    exit 1
+fi
+
+version=${1}
+priority=${2}
+path="/usr/bin/"
+
+master="llvm-config"
+slaves="llvm-addr2line llvm-ar llvm-as llvm-bcanalyzer llvm-bitcode-strip llvm-cat llvm-cfi-verify llvm-cov llvm-c-test llvm-cvtres llvm-cxxdump llvm-cxxfilt llvm-cxxmap llvm-debuginfod llvm-debuginfod-find llvm-diff llvm-dis llvm-dlltool llvm-dwarfdump llvm-dwarfutil llvm-dwp llvm-exegesis llvm-extract llvm-gsymutil llvm-ifs llvm-install-name-tool llvm-jitlink llvm-jitlink-executor llvm-lib llvm-libtool-darwin llvm-link llvm-lipo llvm-lto llvm-lto2 llvm-mc llvm-mca llvm-ml llvm-modextract llvm-mt llvm-nm llvm-objcopy llvm-objdump llvm-omp-device-info llvm-opt-report llvm-otool llvm-pdbutil llvm-PerfectShuffle llvm-profdata llvm-profgen llvm-ranlib llvm-rc llvm-readelf llvm-readobj llvm-reduce llvm-remark-size-diff llvm-rtdyld llvm-sim llvm-size llvm-split llvm-stress llvm-strings llvm-strip llvm-symbolizer llvm-tapi-diff llvm-tblgen llvm-tli-checker llvm-undname llvm-windres llvm-xray"
+
+update_alternatives "${version}" "${priority}" "${master}" "${slaves}" "${path}"
+
+master="clang"
+slaves="analyze-build asan_symbolize bugpoint c-index-test clang++ clang-apply-replacements clang-change-namespace clang-check clang-cl clang-cpp clangd clang-doc clang-extdef-mapping clang-format clang-format-diff clang-include-fixer clang-linker-wrapper clang-move clang-nvlink-wrapper clang-offload-bundler clang-offload-packager clang-offload-wrapper clang-pseudo clang-query clang-refactor clang-rename clang-reorder-fields clang-repl clang-scan-deps clang-tidy count diagtool dsymutil FileCheck find-all-symbols git-clang-format hmaptool hwasan_symbolize intercept-build ld64.lld ld.lld llc lld lldb lldb-argdumper lldb-instr lldb-server lldb-vscode lld-link lli lli-child-target modularize not obj2yaml opt pp-trace run-clang-tidy sancov sanstats scan-build scan-build-py scan-view split-file UnicodeNameMappingGenerator verify-uselistorder wasm-ld yaml2obj yaml-bench"
+
+update_alternatives "${version}" "${priority}" "${master}" "${slaves}" "${path}"

docker/arm64v8/focal/Dockerfile

@@ -29,8 +29,8 @@ RUN apt-get update && \
 
 RUN update_opt.sh 9 1
 
-ARG GHCUP_VERSION=0.1.18.0
-ARG GPG_KEY=7784930957807690A66EBDBE3786C5262ECB4A3F
+ARG GHCUP_VERSION=0.1.19.4
+ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C
 
 # install ghcup
 RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \
@@ -54,10 +54,7 @@ ENV NO_COLOR=1
 RUN ghcup config set gpg-setting GPGStrict && \
 	ghcup --verbose install ghc   --isolate=/usr     --force ${GHC} && \
 	ghcup --verbose install cabal --isolate=/usr/bin --force ${CABAL_INSTALL} && \
-	find "/usr/lib/ghc-${GHC}/" \( -name "*_p.a" -o -name "*.p_hi" \) -type f -delete && \
-	rm -r "/usr/share/doc/ghc-${GHC}" && \
-	rm -rf /tmp/ghcup* && \
-	ghcup gc -p -s -c -t
+	ghcup gc -s -c -t
 
 ENV PATH /root/.cabal/bin:/root/.ghcup/bin:/root/.local/bin:$PATH
 

docker/arm64v8/focal/update_opt.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+# update_alternatives.sh
+
+update_alternatives() {
+    local version=${1}
+    local priority=${2}
+    local master=${3}
+    local slaves=${4}
+    local path=${5}
+    local cmdln
+
+    cmdln="--verbose --install ${path}${master} ${master} ${path}${master}-${version} ${priority}"
+    for slave in ${slaves}; do
+        cmdln="${cmdln} --slave ${path}${slave} ${slave} ${path}${slave}-${version}"
+    done
+    update-alternatives ${cmdln}
+}
+
+if [[ ${#} -ne 2 ]]; then
+    echo usage: "${0}" clang_version priority
+    exit 1
+fi
+
+version=${1}
+priority=${2}
+path="/usr/bin/"
+
+master="llvm-config"
+slaves="llvm-addr2line llvm-ar llvm-as llvm-bcanalyzer llvm-bitcode-strip llvm-cat llvm-cfi-verify llvm-cov llvm-c-test llvm-cvtres llvm-cxxdump llvm-cxxfilt llvm-cxxmap llvm-debuginfod llvm-debuginfod-find llvm-diff llvm-dis llvm-dlltool llvm-dwarfdump llvm-dwarfutil llvm-dwp llvm-exegesis llvm-extract llvm-gsymutil llvm-ifs llvm-install-name-tool llvm-jitlink llvm-jitlink-executor llvm-lib llvm-libtool-darwin llvm-link llvm-lipo llvm-lto llvm-lto2 llvm-mc llvm-mca llvm-ml llvm-modextract llvm-mt llvm-nm llvm-objcopy llvm-objdump llvm-omp-device-info llvm-opt-report llvm-otool llvm-pdbutil llvm-PerfectShuffle llvm-profdata llvm-profgen llvm-ranlib llvm-rc llvm-readelf llvm-readobj llvm-reduce llvm-remark-size-diff llvm-rtdyld llvm-sim llvm-size llvm-split llvm-stress llvm-strings llvm-strip llvm-symbolizer llvm-tapi-diff llvm-tblgen llvm-tli-checker llvm-undname llvm-windres llvm-xray"
+
+update_alternatives "${version}" "${priority}" "${master}" "${slaves}" "${path}"
+
+master="clang"
+slaves="analyze-build asan_symbolize bugpoint c-index-test clang++ clang-apply-replacements clang-change-namespace clang-check clang-cl clang-cpp clangd clang-doc clang-extdef-mapping clang-format clang-format-diff clang-include-fixer clang-linker-wrapper clang-move clang-nvlink-wrapper clang-offload-bundler clang-offload-packager clang-offload-wrapper clang-pseudo clang-query clang-refactor clang-rename clang-reorder-fields clang-repl clang-scan-deps clang-tidy count diagtool dsymutil FileCheck find-all-symbols git-clang-format hmaptool hwasan_symbolize intercept-build ld64.lld ld.lld llc lld lldb lldb-argdumper lldb-instr lldb-server lldb-vscode lld-link lli lli-child-target modularize not obj2yaml opt pp-trace run-clang-tidy sancov sanstats scan-build scan-build-py scan-view split-file UnicodeNameMappingGenerator verify-uselistorder wasm-ld yaml2obj yaml-bench"
+
+update_alternatives "${version}" "${priority}" "${master}" "${slaves}" "${path}"

docs/guide.md

@@ -163,6 +163,7 @@ ghcup --url-source=https://some-url/ghcup-0.0.6.yaml list
 #### Known mirrors
 
 1. [https://mirror.sjtu.edu.cn/docs/ghcup](https://mirror.sjtu.edu.cn/docs/ghcup)
+2. [https://mirrors.ustc.edu.cn/help/ghcup.html](https://mirrors.ustc.edu.cn/help/ghcup.html)
 
 ### (Pre-)Release channels
 
@@ -202,6 +203,34 @@ url-source:
   - "https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml"
 ```
 
+### Nightlies
+
+Nightlies are just another release channel. Currently, only GHC supports nightlies, which are binary releases
+that are built every night from `master`.
+
+To add the nightly channel, run:
+
+```sh
+ghcup config add-release-channel https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-0.0.7.yaml
+```
+
+To list all nightlies from 2023, run:
+
+```sh
+ghcup list --show-nightly --tool=ghc --since=2023-01-01
+```
+
+Ways to install a nightly:
+
+```sh
+# by date
+ghcup install ghc 2023-06-20
+# by version
+ghcup install ghc 9.7.20230619
+# by tag
+ghcup install ghc latest-nightly
+```
+
 ## Stack integration
 
 Stack manages GHC versions internally by default. In order to make it use ghcup installed
@@ -460,8 +489,9 @@ this is cryptographically secure.
 First, obtain the gpg keys:
 
 ```sh
-gpg --batch --keyserver keys.openpgp.org     --recv-keys 7784930957807690A66EBDBE3786C5262ECB4A3F
+gpg --batch --keyserver keys.openpgp.org     --recv-keys 7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C
 gpg --batch --keyserver keyserver.ubuntu.com --recv-keys FE5AB6C91FEA597C3B31180B73EDE9E8CFBAEF01
+gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
 ```
 
 Then verify the gpg key in one of these ways:

docs/index.md

@@ -4,10 +4,6 @@ hide:
   - toc
 ---
 
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-<script src="javascripts/extra.js"></script>
-
-
 <section class="index-ghcup-hero">
   <img alt="haskell logo" src="./haskell_logo.png" />
   <h1>GHCup</h1>
@@ -35,7 +31,7 @@ hide:
       <span>
       </span>
 	<div class="footer">
-		<a href="https://github.com/haskell/ghcup-hs/blob/master/scripts/bootstrap/bootstrap-haskell" target="_blank">What does this do?</a> <b>&nbsp;&middot;&nbsp;</b> <a href="https://www.haskell.org/ghcup/install/#manual-install">I don't like curl | sh</a> <div class="show-all-platforms"><b>&nbsp;&middot;&nbsp;</b> <a class="show-all-platforms-button" href="#">Show all platforms</a></div></p>
+		<a href="https://github.com/haskell/ghcup-hs/blob/master/scripts/bootstrap/bootstrap-haskell" target="_blank">What does this do?</a> <b>&nbsp;&middot;&nbsp;</b> <a href="https://www.haskell.org/ghcup/install/#manual-installation">I don't like curl | sh</a> <div class="show-all-platforms"><b>&nbsp;&middot;&nbsp;</b> <a class="show-all-platforms-button" href="#">Show all platforms</a></div></p>
 	</div>
     </div>
 
@@ -51,7 +47,7 @@ hide:
         <button class="btn" onclick="copyToClipboardWin()" id="ghcup-windows-button"><i class="fa fa-copy"></i></button>
       </div>
 	<div class="footer">
-		<a href="https://github.com/haskell/ghcup-hs/blob/master/scripts/bootstrap/bootstrap-haskell.ps1" target="_blank">What does this do?</a> <b>&nbsp;&middot;&nbsp;</b> <a href="https://www.haskell.org/ghcup/install/#manual-install">I don't like curl | sh</a> <div class="show-all-platforms"><b>&nbsp;&middot;&nbsp;</b> <a class="show-all-platforms-button" href="#">Show all platforms</a></div></p>
+		<a href="https://github.com/haskell/ghcup-hs/blob/master/scripts/bootstrap/bootstrap-haskell.ps1" target="_blank">What does this do?</a> <b>&nbsp;&middot;&nbsp;</b> <a href="https://www.haskell.org/ghcup/install/#manual-installation">I don't like curl | sh</a> <div class="show-all-platforms"><b>&nbsp;&middot;&nbsp;</b> <a class="show-all-platforms-button" href="#">Show all platforms</a></div></p>
 	</div>
     </div>
 </section>
@@ -84,9 +80,6 @@ hide:
    </span>
 </p>
 
-<script type="text/javascript" src="javascripts/ghcup.js"></script>
-
-
 ----
 
 

docs/install.md

@@ -1,7 +1,7 @@
 # Installation
 
 GHCup makes it easy to install specific versions of GHC on GNU/Linux,
-macOS (aka Darwin), FreeBSD and Windows and can also bootstrap a fresh [Haskell developer environment](./install/#supported-tools) from scratch.
+macOS (aka Darwin), FreeBSD and Windows and can also bootstrap a fresh [Haskell developer environment](./#supported-tools) from scratch.
 It follows the UNIX philosophy of [do one thing and do it well](https://en.wikipedia.org/wiki/Unix_philosophy#Do_One_Thing_and_Do_It_Well). Similar in scope to [rustup](https://github.com/rust-lang-nursery/rustup.rs), [pyenv](https://github.com/pyenv/pyenv) and [jenv](http://www.jenv.be).
 
 ## How to install
@@ -24,7 +24,7 @@ Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager
 
 There's also a [youtube video](https://www.youtube.com/watch?v=bB4fmQiUYPw) explaining installation on windows.
 
-If you want to know what these scripts do, check out the [source code at the repository](https://github.com/haskell/ghcup-hs/tree/master/scripts/bootstrap). Advanced users may want to perform a [manual installation](#manual-install) and GPG verify the binaries.
+If you want to know what these scripts do, check out the [source code at the repository](https://github.com/haskell/ghcup-hs/tree/master/scripts/bootstrap). Advanced users may want to perform a [manual installation](#manual-installation) and GPG verify the binaries.
 
 ### Which versions get installed?
 
@@ -77,6 +77,8 @@ On Darwin M1 you might also need a working llvm installed (e.g. via brew) and ha
 
 The following distro packages are required: `curl gcc gmp gmake ncurses perl5 libffi libiconv`
 
+Notice that only FreeBSD 13.x is supported. If the installation fails, complaining about `libncursesw.8.so`, you will need to install FreeBSD 12 compat package first, for example, `pkg install misc/compat12x`.
+
 ### Windows
 
 On Windows, msys2 should already have been set up during the installation, so most users should just proceed. If you are installing manually, make sure to have a working mingw64 toolchain and shell.
@@ -102,10 +104,19 @@ GHCup supports the following tools, which are also known as the **Haskell Toolch
 <table>
 <thead><tr><th>GHC Version</th><th>Tags</th></tr></thead>
 <tbody>
-<tr><td>9.4.3</td><td><span style="color:blue">latest</span>, base-4.17.0.0</td></tr>
+<tr><td>9.6.2</td><td><span style="color:blue">latest</span>, base-4.18.0.0</td></tr>
+<tr><td>9.6.1</td><td>base-4.18.0.0</td></tr>
+<tr><td>9.4.7</td><td>base-4.17.2.0</td></tr>
+<tr><td>9.4.6</td><td>base-4.17.2.0</td></tr>
+<tr><td>9.4.5</td><td>base-4.17.1.0</td></tr>
+<tr><td>9.4.4</td><td>base-4.17.0.0</td></tr>
+<tr><td>9.4.3</td><td>base-4.17.0.0</td></tr>
 <tr><td>9.4.2</td><td>base-4.17.0.0</td></tr>
 <tr><td>9.4.1</td><td>base-4.17.0.0</td></tr>
-<tr><td>9.2.5</td><td><span style="color:green">recommended</span>, base-4.16.4.0</td></tr>
+<tr><td>9.2.8</td><td><span style="color:green">recommended</span>, base-4.16.4.0</td></tr>
+<tr><td>9.2.7</td><td>base-4.16.4.0</td></tr>
+<tr><td>9.2.6</td><td>base-4.16.4.0</td></tr>
+<tr><td>9.2.5</td><td>base-4.16.4.0</td></tr>
 <tr><td>9.2.4</td><td>base-4.16.3.0</td></tr>
 <tr><td>9.2.3</td><td>base-4.16.2.0</td></tr>
 <tr><td>9.2.2</td><td>base-4.16.1.0</td></tr>
@@ -143,7 +154,8 @@ GHCup supports the following tools, which are also known as the **Haskell Toolch
 <table>
 <thead><tr><th>Cabal Version</th><th>Tags</th></tr></thead>
 <tbody>
-<tr><td>3.8.1.0</td><td><span style="color:blue">latest</span></td></tr>
+<tr><td>3.10.1.0</td><td><span style="color:blue">latest</span></td></tr>
+<tr><td>3.8.1.0</td><td></td></tr>
 <tr><td>3.6.2.0</td><td><span style="color:green">recommended</span></td></tr>
 <tr><td>3.6.0.0</td><td></td></tr>
 <tr><td>3.4.1.0</td><td></td></tr>
@@ -159,7 +171,14 @@ GHCup supports the following tools, which are also known as the **Haskell Toolch
 <table>
 <thead><tr><th>HLS Version</th><th>Tags</th></tr></thead>
 <tbody>
-<tr><td>1.8.0.0</td><td><span style="color:blue">latest</span>, <span style="color:green">recommended</span></td></tr>
+<tr><td>2.2.0.0</td><td><span style="color:blue">latest</span>, <span style="color:green">recommended</span></td></tr>
+<tr><td>2.1.0.0</td><td></td></tr>
+<tr><td>2.0.0.1</td><td></td></tr>
+<tr><td>2.0.0.0</td><td></td></tr>
+<tr><td>1.10.0.0</td><td></td></tr>
+<tr><td>1.9.1.0</td><td></td></tr>
+<tr><td>1.9.0.0</td><td></td></tr>
+<tr><td>1.8.0.0</td><td></td></tr>
 <tr><td>1.7.0.0</td><td></td></tr>
 <tr><td>1.6.1.0</td><td></td></tr>
 <tr><td>1.6.0.0</td><td></td></tr>
@@ -177,7 +196,9 @@ GHCup supports the following tools, which are also known as the **Haskell Toolch
 <table>
 <thead><tr><th>Stack Version</th><th>Tags</th></tr></thead>
 <tbody>
-<tr><td>2.9.1</td><td><span style="color:blue">latest</span>, <span style="color:green">recommended</span></td></tr>
+<tr><td>2.11.1</td><td><span style="color:blue">latest</span></td></tr>
+<tr><td>2.9.3</td><td><span style="color:green">recommended</span></td></tr>
+<tr><td>2.9.1</td><td></td></tr>
 <tr><td>2.7.5</td><td></td></tr>
 <tr><td>2.7.3</td><td></td></tr>
 <tr><td>2.7.1</td><td></td></tr>
@@ -190,7 +211,7 @@ GHCup supports the following tools, which are also known as the **Haskell Toolch
 
 This list may not be exhaustive and specifies support for bindists only.
 
-| Platform | Architecture | ghcup | GHC | cabal | HLS | stack | 
+| Platform | Architecture | ghcup | GHC | cabal | HLS | stack |
 | ------ | ------ | ------ | ------ | ------ | ------ | ------ |
 | Windows 7 | amd64 | ❔ | ✅ | ✅ | ✅ | ✅ |
 | Windows 10 | amd64 | ✅ | ✅ | ✅ | ✅ | ✅ |
@@ -231,8 +252,9 @@ There are various issues with GHC itself.
 
 ### FreeBSD
 
-Lacks some upstream bindists and may need compat libs, since most bindists are built on FreeBSD-12.
+Lacks some upstream bindists and may need compat libs (such as `misc/compat12x`).
 HLS bindists are experimental.
+Only latest FreeBSD is generally supported.
 
 ### Linux ARMv7/AARCH64
 
@@ -245,7 +267,7 @@ Lower availability of bindists. Stack and HLS binaries are experimental.
 Download the binary for your platform at [https://downloads.haskell.org/~ghcup/](https://downloads.haskell.org/~ghcup/)
 and place it into your `PATH` anywhere.
 
-If you want to GPG verify the binaries, import the following keys first: `7784930957807690A66EBDBE3786C5262ECB4A3F` and `FE5AB6C91FEA597C3B31180B73EDE9E8CFBAEF01`.
+If you want to GPG verify the binaries, import the following keys first: `7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C` and `FE5AB6C91FEA597C3B31180B73EDE9E8CFBAEF01`.
 
 Then adjust your `PATH` in `~/.bashrc` (or similar, depending on your shell) like so:
 
@@ -307,6 +329,24 @@ export PATH="$HOME/.cabal/bin:$HOME/.ghcup/bin:$PATH"
 
 All set. You can run `cabal init` now in an empty directory to start a project.
 
+## Esoteric distros
+
+### Void Linux
+
+Since void linux can be installed with glibc and musl, it's hard to support correctly with ghcup.
+One way to make ghcup work on **Void Linux musl** is to follow the [Overriding distro detection](../guide/#overriding-distro-detection)
+section and tell it to consider Alpine bindists only. E.g.:
+
+```sh
+curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_MINIMAL=1 sh
+source ~/.ghcup/env
+ghcup config set platform-override '{ "arch": "A_64", "platform": { "contents": "Alpine", "tag": "Linux" }, "version": "3.17" }'
+ghcup install cabal --set latest
+ghcup install ghc --set latest
+ghcup install stack --set latest
+ghcup install hls --set latest
+```
+
 ## Vim integration
 
 See [ghcup.vim](https://github.com/hasufell/ghcup.vim).

docs/overrides/base.html

@@ -1,201 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ config.theme.locale|default('en') }}">
-    <head>
-      {%- block site_meta %}
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        {% if page and page.is_homepage %}<meta name="description" content="{{ config['site_description'] }}">{% endif %}
-        {% if config.site_author %}<meta name="author" content="{{ config.site_author }}">{% endif %}
-        {% if page and page.canonical_url %}<link rel="canonical" href="{{ page.canonical_url }}">{% endif %}
-        {% if config.site_favicon %}<link rel="shortcut icon" href="{{ config.site_favicon|url }}">
-        {% else %}<link rel="shortcut icon" href="{{ 'img/favicon.ico'|url }}">{% endif %}
-      {%- endblock %}
-
-      {%- block htmltitle %}
-        <title>{% if page and page.title and not page.is_homepage %}{{ page.title }} - {% endif %}{{ config.site_name }}</title>
-      {%- endblock %}
-
-      {%- block styles %}
-        <link href="{{ 'css/bootstrap.min.css'|url }}" rel="stylesheet">
-        <link href="{{ 'css/font-awesome.min.css'|url }}" rel="stylesheet">
-        <link href="{{ 'css/base.css'|url }}" rel="stylesheet">
-        {%- if config.theme.highlightjs %}
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.5.0/styles/{{ config.theme.hljs_style }}.min.css">
-        {%- endif %}
-        {%- for path in extra_css %}
-        <link href="{{ path }}" rel="stylesheet">
-        {%- endfor %}
-      {%- endblock %}
-
-      {%- block libs %}
-
-        <script src="{{ 'js/jquery-1.10.2.min.js'|url }}" defer></script>
-        <script src="{{ 'js/bootstrap.min.js'|url }}" defer></script>
-        {%- if config.theme.highlightjs %}
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.5.0/highlight.min.js"></script>
-        {%- for lang in config.theme.hljs_languages %}
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.5.0/languages/{{lang}}.min.js"></script>
-        {%- endfor %}
-        <script>hljs.initHighlightingOnLoad();</script>
-        {%- endif %}
-      {%- endblock %}
-
-      {%- block analytics %}
-        {%- if config.theme.analytics.gtag %}
-        <script async src="https://www.googletagmanager.com/gtag/js?id={{ config.theme.analytics.gtag }}"></script>
-        <script>
-          window.dataLayer = window.dataLayer || [];
-          function gtag(){dataLayer.push(arguments);}
-          gtag('js', new Date());
-
-          gtag('config', '{{ config.theme.analytics.gtag }}');
-        </script>
-        {%- elif config.google_analytics %}
-        <script>
-            (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-            })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-            ga('create', '{{ config.google_analytics[0] }}', '{{ config.google_analytics[1] }}');
-            ga('send', 'pageview');
-        </script>
-        {%- endif %}
-      {%- endblock %}
-
-      {%- block extrahead %} {% endblock %}
-    </head>
-
-    <body{% if page and page.is_homepage %} class="homepage"{% endif %}>
-        <div class="navbar fixed-top navbar-expand-lg navbar-{% if config.theme.nav_style == "light" %}light{% else %}dark{% endif %} bg-{{ config.theme.nav_style }}">
-            <div class="container">
-
-                {%- block site_name %}
-                <a class="navbar-brand" href="{{ nav.homepage.url|url }}">{{ config.site_name }}</a>
-                {%- endblock %}
-
-                {%- if nav|length>1 or (page and (page.next_page or page.previous_page)) or config.repo_url %}
-                <!-- Expander button -->
-                <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbar-collapse">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                {%- endif %}
-
-                <!-- Expanded navigation -->
-                <div id="navbar-collapse" class="navbar-collapse collapse">
-                  {%- block site_nav %}
-                    {%- if nav|length>1 %}
-                        <!-- Main navigation -->
-                        <ul class="nav navbar-nav">
-                        {%- for nav_item in nav %}
-                        {%- if nav_item.children %}
-                            <li class="dropdown{% if nav_item.active %} active{% endif %}">
-                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">{{ nav_item.title }} <b class="caret"></b></a>
-                                <ul class="dropdown-menu">
-                                {%- for nav_item in nav_item.children %}
-                                    {% include "nav-sub.html" %}
-                                {%- endfor %}
-                                </ul>
-                            </li>
-                        {%- else %}
-                            <li class="navitem{% if nav_item.active %} active{% endif %}">
-                                <a href="{{ nav_item.url|url }}" class="nav-link">{{ nav_item.title }}</a>
-                            </li>
-                        {%- endif %}
-                        {%- endfor %}
-                        </ul>
-                    {%- endif %}
-                  {%- endblock %}
-
-                    <ul class="nav navbar-nav ml-auto">
-                      {%- block search_button %}
-                        {%- if 'search' in config['plugins'] %}
-                        <li class="nav-item">
-                            <a href="#" class="nav-link" data-toggle="modal" data-target="#mkdocs_search_modal">
-                                <i class="fa fa-search"></i> {% trans %}Search{% endtrans %}
-                            </a>
-                        </li>
-                        {%- endif %}
-                      {%- endblock %}
-
-                      {%- block next_prev %}
-                      {%- endblock %}
-
-                      {%- block repo %}
-                        {%- if page and page.edit_url %}
-                            <li class="nav-item">
-                                <a href="{{ page.edit_url }}" class="nav-link">
-                                    {%- if config.repo_name == 'GitHub' -%}
-                                        <i class="fa fa-github"></i> {% trans repo_name=config.repo_name %}Edit on {{ repo_name }}{% endtrans %}
-                                    {%- elif config.repo_name == 'Bitbucket' -%}
-                                        <i class="fa fa-bitbucket"></i> {% trans repo_name=config.repo_name %}Edit on {{ repo_name }}{% endtrans %}
-                                    {%- elif config.repo_name == 'GitLab' -%}
-                                        <i class="fa fa-gitlab"></i> {% trans repo_name=config.repo_name %}Edit on {{ repo_name }}{% endtrans %}
-                                    {%- else -%}
-                                    {% trans repo_name=config.repo_name%}Edit on {{ repo_name }}{% endtrans %}
-                                    {%- endif -%}
-                                </a>
-                            </li>
-                        {%- elif config.repo_url %}
-                            <li class="nav-item">
-                                <a href="{{ config.repo_url }}" class="nav-link">
-                                    {%- if config.repo_name == 'GitHub' -%}
-                                        <i class="fa fa-github"></i> {{ config.repo_name }}
-                                    {%- elif config.repo_name == 'Bitbucket' -%}
-                                        <i class="fa fa-bitbucket"></i> {{ config.repo_name }}
-                                    {%- elif config.repo_name == 'GitLab' -%}
-                                        <i class="fa fa-gitlab"></i> {{ config.repo_name }}
-                                    {%- else -%}
-                                    {{ config.repo_name }}
-                                    {%- endif -%}
-                                </a>
-                            </li>
-                        {%- endif %}
-                      {%- endblock %}
-                    </ul>
-                </div>
-            </div>
-        </div>
-
-        <div class="container">
-            <div class="row">
-                {%- block content %}
-                    <div class="col-md-3">{% include "toc.html" %}</div>
-                    <div class="col-md-9" role="main">{% include "content.html" %}</div>
-                {%- endblock %}
-            </div>
-        </div>
-
-        <footer class="col-md-12">
-          {%- block footer %}
-            <hr>
-            {%- if config.copyright %}
-                <p>{{ config.copyright }}</p>
-            {%- endif %}
-            <p>{% trans mkdocs_link='<a href="https://www.mkdocs.org/">MkDocs</a>' %}Documentation built with {{ mkdocs_link }}.{% endtrans %}</p>
-          {%- endblock %}
-        </footer>
-
-      {%- block scripts %}
-        <script>
-            var base_url = {{ base_url | tojson }},
-                shortcuts = {{ config.theme.shortcuts | tojson }};
-        </script>
-        <script src="{{ 'js/base.js'|url }}" defer></script>
-        {%- for path in extra_javascript %}
-        <script src="{{ path }}" defer></script>
-        {%- endfor %}
-      {%- endblock %}
-
-        {% if 'search' in config['plugins'] %}{%- include "search-modal.html" %}{% endif %}
-        {%- include "keyboard-modal.html" %}
-
-    </body>
-</html>
-{% if page and page.is_homepage %}
-<!--
-MkDocs version : {{ mkdocs_version }}
-Build Date UTC : {{ build_date_utc }}
--->
-{% endif %}

docs/overrides/main.html

@@ -0,0 +1,4 @@
+{% extends "base.html" %}
+<!-- Get rid of the next/prev buttons -->
+{% block next_prev %}
+{% endblock %}

docs/steps.md

@@ -328,7 +328,7 @@ see the [Cabal user guide](https://cabal.readthedocs.io/en/stable/getting-starte
 <a href="https://hackage.haskell.org/" class="btn btn-primary" role="button">Discover Haskell packages</a>
 <a href="https://hackage.haskell.org/package/base" class="btn btn-primary" role="button">The standard library</a>
 <a href="https://haskell-language-server.readthedocs.io/en/stable/installation.html" class="btn btn-primary" role="button">Editor setup with HLS</a>
-<a href="https://play-haskell.tomsmeding.com/play" class="btn btn-primary" role="button">Online playground</a>
+<a href="https://play.haskell.org/" class="btn btn-primary" role="button">Online playground</a>
 </div>
 
 ## How to learn Haskell proper

ghcup.cabal

@@ -1,6 +1,6 @@
 cabal-version:      2.4
 name:               ghcup
-version:            0.1.18.1
+version:            0.1.19.5
 license:            LGPL-3.0-only
 license-file:       LICENSE
 copyright:          Julian Ospald 2020
@@ -25,10 +25,10 @@ extra-source-files:
   cbits/dirutils.h
   data/build_mk/cross
   data/build_mk/default
+  test/data/dir/.keep
+  test/data/file
   test/golden/unix/GHCupInfo.json
   test/golden/windows/GHCupInfo.json
-  test/data/file
-  test/data/dir/.keep
 
 source-repository head
   type:     git
@@ -53,6 +53,43 @@ flag no-exe
   default:     False
   manual:      True
 
+common app-common-depends
+  build-depends:
+    , aeson                  >=1.4
+    , aeson-pretty           ^>=0.8.8
+    , async                  ^>=2.2.3
+    , base                   >=4.12     && <5
+    , bytestring             >=0.10     && <0.12
+    , cabal-install-parsers  >=0.4.5
+    , cabal-plan             ^>=0.7.2
+    , containers             ^>=0.6
+    , deepseq                ^>=1.4
+    , directory              ^>=1.3.6.0
+    , filepath               ^>=1.4.2.1
+    , haskus-utils-types     ^>=1.5
+    , haskus-utils-variant   ^>=3.2.1
+    , libarchive             ^>=3.0.3.0
+    , megaparsec             >=8.0.0    && <9.3
+    , mtl                    ^>=2.2
+    , optparse-applicative   >=0.15.1.0 && <0.18
+    , pretty                 ^>=1.1.3.1
+    , pretty-terminal        ^>=0.1.0.0
+    , process                ^>=1.6.11.0
+    , resourcet              ^>=1.2.2
+    , safe                   ^>=0.3.18
+    , safe-exceptions        ^>=0.1
+    , tagsoup                ^>=0.14
+    , template-haskell       >=2.7      && <2.20
+    , temporary              ^>=1.3
+    , text                   ^>=2.0
+    , time                   >=1.9.3    && <1.12
+    , unordered-containers   ^>=0.2
+    , uri-bytestring         ^>=0.3.2.2
+    , utf8-string            ^>=1.0
+    , vector                 ^>=0.12
+    , versions               >=4.0.1    && <5.1
+    , yaml-streamly          ^>=0.12.0
+
 library
   exposed-modules:
     GHCup
@@ -137,7 +174,7 @@ library
     , pretty-terminal       ^>=0.1.0.0
     , regex-posix           ^>=0.96
     , resourcet             ^>=1.2.2
-    , retry                 ^>=0.8.1.2
+    , retry                 >=0.8.1.2    && <0.10
     , safe                  ^>=0.3.18
     , safe-exceptions       ^>=0.1
     , split                 ^>=0.2.3.4
@@ -146,7 +183,7 @@ library
     , template-haskell      >=2.7        && <2.20
     , temporary             ^>=1.3
     , text                  ^>=2.0
-    , time                  ^>=1.9.3
+    , time                  >=1.9.3      && <1.12
     , transformers          ^>=0.5
     , unliftio-core         ^>=0.2.0.1
     , unordered-containers  ^>=0.2.10.0
@@ -185,9 +222,8 @@ library
       GHCup.Prelude.File.Posix.Foreign
       GHCup.Prelude.Posix
       GHCup.Prelude.Process.Posix
-    exposed-modules:
-      GHCup.Prelude.File.Posix.Traversals
 
+    exposed-modules:  GHCup.Prelude.File.Posix.Traversals
     include-dirs:     cbits
     includes:         dirutils.h
     install-includes: dirutils.h
@@ -202,7 +238,67 @@ library
     cpp-options:   -DBRICK
     build-depends: vty ^>=5.37
 
+library ghcup-optparse
+  import:             app-common-depends
+  exposed-modules:
+    GHCup.OptParse
+    GHCup.OptParse.ChangeLog
+    GHCup.OptParse.Common
+    GHCup.OptParse.Compile
+    GHCup.OptParse.Config
+    GHCup.OptParse.DInfo
+    GHCup.OptParse.GC
+    GHCup.OptParse.Install
+    GHCup.OptParse.List
+    GHCup.OptParse.Nuke
+    GHCup.OptParse.Prefetch
+    GHCup.OptParse.Rm
+    GHCup.OptParse.Run
+    GHCup.OptParse.Set
+    GHCup.OptParse.Test
+    GHCup.OptParse.ToolRequirements
+    GHCup.OptParse.UnSet
+    GHCup.OptParse.Upgrade
+    GHCup.OptParse.Whereis
+
+  hs-source-dirs:     app/ghcup
+  default-language:   Haskell2010
+  default-extensions:
+    LambdaCase
+    MultiWayIf
+    NamedFieldPuns
+    PackageImports
+    RecordWildCards
+    ScopedTypeVariables
+    StrictData
+    TupleSections
+
+  ghc-options:
+    -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
+    -fwarn-incomplete-record-updates
+
+  build-depends:      ghcup
+
+  if flag(internal-downloader)
+    cpp-options: -DINTERNAL_DOWNLOADER
+
+  if (flag(tui) && !os(windows))
+    cpp-options:   -DBRICK
+    other-modules: BrickMain
+    build-depends:
+      , brick         ^>=1.5
+      , transformers  ^>=0.5
+      , unix          ^>=2.7
+      , vty           ^>=5.37
+
+  if os(windows)
+    cpp-options: -DIS_WINDOWS
+
+  else
+    build-depends: unix ^>=2.7
+
 executable ghcup
+  import:             app-common-depends
   main-is:            Main.hs
   other-modules:
     GHCup.OptParse
@@ -242,40 +338,8 @@ executable ghcup
     -fwarn-incomplete-record-updates -threaded
 
   build-depends:
-    , aeson                 >=1.4
-    , aeson-pretty          ^>=0.8.8
-    , async                 ^>=2.2.3
-    , base                  >=4.12     && <5
-    , bytestring            >=0.10     && <0.12
-    , cabal-plan            ^>=0.7.2
-    , cabal-install-parsers >=0.4.5
-    , containers            ^>=0.6
-    , deepseq               ^>=1.4
-    , directory             ^>=1.3.6.0
-    , filepath              ^>=1.4.2.1
     , ghcup
-    , haskus-utils-types    ^>=1.5
-    , haskus-utils-variant  ^>=3.2.1
-    , libarchive            ^>=3.0.3.0
-    , megaparsec            >=8.0.0    && <9.3
-    , mtl                   ^>=2.2
-    , optparse-applicative  >=0.15.1.0 && <0.18
-    , pretty                ^>=1.1.3.1
-    , pretty-terminal       ^>=0.1.0.0
-    , process               ^>=1.6.11.0
-    , resourcet             ^>=1.2.2
-    , safe                  ^>=0.3.18
-    , safe-exceptions       ^>=0.1
-    , tagsoup               ^>=0.14
-    , template-haskell      >=2.7        && <2.20
-    , temporary             ^>=1.3
-    , text                  ^>=2.0
-    , unordered-containers  ^>=0.2
-    , uri-bytestring        ^>=0.3.2.2
-    , utf8-string           ^>=1.0
-    , vector                ^>=0.12
-    , versions              >=4.0.1    && <5.1
-    , yaml-streamly         ^>=0.12.0
+    , ghcup-optparse
 
   if flag(internal-downloader)
     cpp-options: -DINTERNAL_DOWNLOADER
@@ -302,12 +366,12 @@ test-suite ghcup-test
   type:               exitcode-stdio-1.0
   main-is:            Main.hs
   build-tool-depends: hspec-discover:hspec-discover -any
-  hs-source-dirs:     test
+  hs-source-dirs:     test/ghcup-test
   other-modules:
     GHCup.ArbitraryTypes
+    GHCup.Prelude.File.Posix.TraversalsSpec
     GHCup.Types.JSONSpec
     GHCup.Utils.FileSpec
-    GHCup.Prelude.File.Posix.TraversalsSpec
     Spec
 
   default-language:   Haskell2010
@@ -337,11 +401,48 @@ test-suite ghcup-test
     , quickcheck-arbitrary-adt  ^>=0.3.1.0
     , streamly                  ^>=0.8.2
     , text                      ^>=2.0
+    , time                      >=1.9.3   && <1.12
     , uri-bytestring            ^>=0.3.2.2
     , versions                  >=4.0.1   && <5.1
 
   if os(windows)
     cpp-options: -DIS_WINDOWS
+
   else
-    build-depends:
-      , unix             ^>=2.7
+    build-depends: unix ^>=2.7
+
+test-suite ghcup-optparse-test
+  type:             exitcode-stdio-1.0
+  hs-source-dirs:   test/optparse-test
+  main-is:          Main.hs
+  other-modules:
+    ChangeLogTest
+    CompileTest
+    ConfigTest
+    GCTest
+    InstallTest
+    ListTest
+    OtherCommandTest
+    RmTest
+    RunTest
+    SetTest
+    UnsetTest
+    UpgradeTest
+    Utils
+    WhereisTest
+
+  if os(windows)
+    cpp-options: -DIS_WINDOWS
+
+  default-language: Haskell2010
+  ghc-options:      -Wall
+  build-depends:
+    , base
+    , ghcup
+    , ghcup-optparse
+    , optparse-applicative
+    , tasty
+    , tasty-hunit
+    , text
+    , uri-bytestring
+    , versions

hie.yaml

@@ -5,4 +5,6 @@ cradle:
   - component: "ghcup:exe:ghcup"
     path: ./app/ghcup
   - component: "ghcup:test:ghcup-test"
-    path: ./test
+    path: ./test/ghcup-test
+  - component: "ghcup:test:ghcup-optparse-test"
+    path: ./test/optparse-test

lib/GHCup.hs

@@ -134,15 +134,24 @@ rmTool :: ( MonadReader env m
           => ListResult
           -> Excepts '[NotInstalled, UninstallFailed] m ()
 rmTool ListResult {lVer, lTool, lCross} = do
-  logInfo $ "removing " <> T.pack (show lTool) <> " version " <> prettyVer lVer
+  let printRmTool = logInfo $ "removing " <> T.pack (show lTool) <> " version " <> prettyVer lVer
   case lTool of
-    GHC ->
+    GHC -> do
       let ghcTargetVersion = GHCTargetVersion lCross lVer
-      in rmGHCVer ghcTargetVersion
-    HLS -> rmHLSVer lVer
-    Cabal -> liftE $ rmCabalVer lVer
-    Stack -> liftE $ rmStackVer lVer
-    GHCup -> lift rmGhcup
+      logInfo $ "removing " <> T.pack (show lTool) <> " version " <> tVerToText ghcTargetVersion
+      rmGHCVer ghcTargetVersion
+    HLS -> do
+      printRmTool
+      rmHLSVer lVer
+    Cabal -> do
+      printRmTool
+      liftE $ rmCabalVer lVer
+    Stack -> do
+      printRmTool
+      liftE $ rmStackVer lVer
+    GHCup -> do
+      printRmTool
+      lift rmGhcup
 
 
 rmGhcupDirs :: ( MonadReader env m
@@ -303,7 +312,7 @@ upgradeGHCup mtarget force' fatal = do
   GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
 
   lift $ logInfo "Upgrading GHCup..."
-  let latestVer = fst (fromJust (getLatest dls GHCup))
+  let latestVer = _tvVersion $ fst (fromJust (getLatest dls GHCup))
   (Just ghcupPVPVer) <- pure $ pvpToVersion ghcUpVer ""
   when (not force' && (latestVer <= ghcupPVPVer)) $ throwE NoUpdate
   dli   <- liftE $ getDownloadInfo GHCup latestVer
@@ -492,7 +501,7 @@ rmOldGHC :: ( MonadReader env m
          => Excepts '[NotInstalled, UninstallFailed] m ()
 rmOldGHC = do
   GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-  let oldGHCs = mkTVer <$> toListOf (ix GHC % getTagged Old % to fst) dls
+  let oldGHCs = toListOf (ix GHC % getTagged Old % to fst) dls
   ghcs <- lift $ fmap rights getInstalledGHCs
   forM_ ghcs $ \ghc -> when (ghc `elem` oldGHCs) $ rmGHCVer ghc
 

lib/GHCup/Cabal.hs

@@ -38,6 +38,7 @@ import           Control.Monad.Trans.Resource
                                          hiding ( throwM )
 import           Data.Either
 import           Data.List
+import           Data.Ord
 import           Data.Maybe
 import           Data.Versions                hiding ( patch )
 import           Haskus.Utils.Variant.Excepts
@@ -280,6 +281,6 @@ rmCabalVer ver = do
 
   when (Just ver == cSet) $ do
     cVers <- lift $ fmap rights getInstalledCabals
-    case headMay . reverse . sort $ cVers of
+    case headMay . sortBy (comparing Down) $ cVers of
       Just latestver -> setCabal latestver
       Nothing        -> lift $ rmLink (binDir </> "cabal" <> exeExt)

lib/GHCup/Download.hs

@@ -263,10 +263,13 @@ getBase uri = do
     dlWithMod modTime json_file = do
       let (dir, fn) = splitFileName json_file
       f <- liftE $ download uri' (Just $ over pathL' (<> ".sig") uri') Nothing Nothing dir (Just fn) True
-      liftIO $ setModificationTime f modTime
-      liftIO $ setAccessTime f modTime
-      pure f
 
+      -- make these failures non-fatal, also see:
+      -- https://github.com/actions/runner-images/issues/7061
+      handleIO (\e -> logWarn $ "setModificationTime failed with: " <> T.pack (displayException e)) $ liftIO $ setModificationTime f modTime
+      handleIO (\e -> logWarn $ "setAccessTime failed with: " <> T.pack (displayException e)) $ liftIO $ setAccessTime f modTime
+
+      pure f
 
 getDownloadInfo :: ( MonadReader env m
                    , HasPlatformReq env
@@ -279,8 +282,21 @@ getDownloadInfo :: ( MonadReader env m
                      '[NoDownload]
                      m
                      DownloadInfo
-getDownloadInfo t v = do
-  (PlatformRequest a p mv) <- lift getPlatformReq
+getDownloadInfo t v = getDownloadInfo' t (mkTVer v)
+
+getDownloadInfo' :: ( MonadReader env m
+                    , HasPlatformReq env
+                    , HasGHCupInfo env
+                    )
+                 => Tool
+                 -> GHCTargetVersion
+                 -- ^ tool version
+                 -> Excepts
+                      '[NoDownload]
+                      m
+                      DownloadInfo
+getDownloadInfo' t v = do
+  pfreq@(PlatformRequest a p mv) <- lift getPlatformReq
   GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
 
   let distro_preview f g =
@@ -301,7 +317,7 @@ getDownloadInfo t v = do
       without_distro     = distro_preview (set _Linux UnknownLinux) (const Nothing)
 
   maybe
-    (throwE NoDownload)
+    (throwE $ NoDownload v t (Just pfreq))
     pure
     (case p of
       -- non-musl won't work on alpine
@@ -629,7 +645,9 @@ downloadCached dli mfn = do
     True -> downloadCached' dli mfn Nothing
     False -> do
       tmp <- lift withGHCupTmpDir
-      liftE $ download (_dlUri dli) Nothing (Just (_dlHash dli)) (_dlCSize dli) (fromGHCupPath tmp) mfn False
+      liftE $ download (_dlUri dli) Nothing (Just (_dlHash dli)) (_dlCSize dli) (fromGHCupPath tmp) outputFileName False
+ where
+  outputFileName = mfn <|> _dlOutput dli
 
 
 downloadCached' :: ( MonadReader env m
@@ -648,7 +666,7 @@ downloadCached' :: ( MonadReader env m
 downloadCached' dli mfn mDestDir = do
   Dirs { cacheDir } <- lift getDirs
   let destDir = fromMaybe (fromGHCupPath cacheDir) mDestDir
-  let fn = fromMaybe ((T.unpack . decUTF8Safe) $ urlBaseName $ view (dlUri % pathL') dli) mfn
+  let fn = fromMaybe ((T.unpack . decUTF8Safe) $ urlBaseName $ view (dlUri % pathL') dli) outputFileName
   let cachfile = destDir </> fn
   fileExists <- liftIO $ doesFileExist cachfile
   if
@@ -656,7 +674,9 @@ downloadCached' dli mfn mDestDir = do
       forM_ (view dlCSize dli) $ \s -> liftE $ checkCSize s cachfile
       liftE $ checkDigest (view dlHash dli) cachfile
       pure cachfile
-    | otherwise -> liftE $ download (_dlUri dli) Nothing (Just (_dlHash dli)) (_dlCSize dli) destDir mfn False
+    | otherwise -> liftE $ download (_dlUri dli) Nothing (Just (_dlHash dli)) (_dlCSize dli) destDir outputFileName False
+ where
+  outputFileName = mfn <|> _dlOutput dli
 
 
 

lib/GHCup/Errors.hs

@@ -35,7 +35,10 @@ import           URI.ByteString
 
 import qualified Data.Map.Strict               as M
 import qualified Data.Text                     as T
+import qualified Data.Text.Encoding            as E
+import qualified Data.Text.Encoding.Error      as E
 import           Data.Data (Proxy(..))
+import Data.Time (Day)
 
 
 
@@ -57,6 +60,7 @@ allHFError = unlines allErrors
     , let proxy = Proxy :: Proxy CopyError in format proxy
     , let proxy = Proxy :: Proxy MergeFileTreeError in format proxy
     , let proxy = Proxy :: Proxy TagNotFound in format proxy
+    , let proxy = Proxy :: Proxy DayNotFound in format proxy
     , let proxy = Proxy :: Proxy NextVerNotFound in format proxy
     , let proxy = Proxy :: Proxy AlreadyInstalled in format proxy
     , let proxy = Proxy :: Proxy DirNotEmpty in format proxy
@@ -82,6 +86,7 @@ allHFError = unlines allErrors
     , let proxy = Proxy :: Proxy HadrianNotFound in format proxy
     , let proxy = Proxy :: Proxy ToolShadowed in format proxy
     , let proxy = Proxy :: Proxy ContentLengthError in format proxy
+    , let proxy = Proxy :: Proxy DuplicateReleaseChannel in format proxy
     , ""
     , "# high level errors (4000+)"
     , let proxy = Proxy :: Proxy DownloadFailed in format proxy
@@ -201,12 +206,26 @@ instance HFErrorProject NoCompatiblePlatform where
   eDesc _ = "No compatible platform could be found"
 
 -- | Unable to find a download for the requested version/distro.
-data NoDownload = NoDownload
+data NoDownload = NoDownload GHCTargetVersion Tool (Maybe PlatformRequest)
+                | NoDownload' GlobalTool
   deriving Show
 
 instance Pretty NoDownload where
-  pPrint NoDownload =
-    text (eDesc (Proxy :: Proxy NoDownload))
+  pPrint (NoDownload tver@(GHCTargetVersion mtarget vv) tool mpfreq)
+    | (Just target) <- mtarget
+    , target `elem` (T.pack . prettyShow <$> enumFromTo (minBound :: Tool) (maxBound :: Tool))
+    = text $ "Unable to find a download for "
+             <> show tool
+             <> " version '"
+             <> T.unpack (tVerToText tver)
+             <> maybe "'\n" (\pfreq -> "' on detected platform " <> pfReqToString pfreq <> "\n") mpfreq
+             <> "Perhaps you meant: 'ghcup <command> "
+             <> T.unpack target
+             <> " "
+             <> T.unpack (prettyVer vv)
+             <> "'"
+    | otherwise = text $ "Unable to find a download for " <> T.unpack (tVerToText tver)
+  pPrint (NoDownload' globalTool) = text $ "Unable to find a download for " <> prettyShow globalTool
 
 instance HFErrorProject NoDownload where
   eBase _ = 10
@@ -308,6 +327,21 @@ instance HFErrorProject TagNotFound where
   eBase _ = 90
   eDesc _ = "Unable to find a tag of a tool"
 
+-- | Unable to find a release day of a tool
+data DayNotFound = DayNotFound Day Tool (Maybe Day)
+  deriving Show
+
+instance Pretty DayNotFound where
+  pPrint (DayNotFound day tool Nothing) =
+    text "Unable to find release date" <+> text (show day) <+> text "of tool" <+> pPrint tool
+  pPrint (DayNotFound day tool (Just alternateDay)) =
+    text "Unable to find release date" <+> text (show day) <+> text "of tool" <+> pPrint tool <+>
+      text "but found an alternative date" <+> text (show alternateDay)
+
+instance HFErrorProject DayNotFound where
+  eBase _ = 95
+  eDesc _ = "Unable to find a release date of a tool"
+
 -- | Unable to find the next version of a tool (the one after the currently
 -- set one).
 data NextVerNotFound = NextVerNotFound Tool
@@ -640,6 +674,19 @@ instance HFErrorProject ContentLengthError where
   eBase _ = 340
   eDesc _ = "File content length verification failed"
 
+data DuplicateReleaseChannel = DuplicateReleaseChannel URI
+  deriving Show
+
+instance HFErrorProject DuplicateReleaseChannel where
+  eBase _ = 350
+  eDesc _ = "Duplicate release channel detected when adding URI.\nGiving up. You can use '--force' to remove and append the duplicate URI (this may change order/semantics)."
+
+instance Pretty DuplicateReleaseChannel where
+  pPrint (DuplicateReleaseChannel uri) =
+    text $ "Duplicate release channel detected when adding: \n  "
+      <> (T.unpack . E.decodeUtf8With E.lenientDecode . serializeURIRef') uri
+      <> "\nGiving up. You can use '--force' to remove and append the duplicate URI (this may change order/semantics)."
+
     -------------------------
     --[ High-level errors ]--
     -------------------------

lib/GHCup/GHC.hs

@@ -80,9 +80,10 @@ import qualified Data.Text.Encoding            as E
 import qualified Text.Megaparsec               as MP
 
 
-data GHCVer v = SourceDist v
-              | GitDist GitBranch
-              | RemoteDist URI
+data GHCVer = SourceDist Version
+            | GitDist GitBranch
+            | RemoteDist URI
+            deriving (Eq, Show)
 
 
 
@@ -105,7 +106,7 @@ testGHCVer :: ( MonadFail m
               , MonadIO m
               , MonadUnliftIO m
               )
-           => Version
+           => GHCTargetVersion
            -> [T.Text]
            -> Excepts
                 '[ DigestError
@@ -125,7 +126,7 @@ testGHCVer ver addMakeArgs = do
 
   dlInfo <-
     preview (ix GHC % ix ver % viTestDL % _Just) dls
-      ?? NoDownload
+      ?? NoDownload ver GHC Nothing
 
   liftE $ testGHCBindist dlInfo ver addMakeArgs
 
@@ -145,7 +146,7 @@ testGHCBindist :: ( MonadFail m
                   , MonadUnliftIO m
                   )
                => DownloadInfo
-               -> Version
+               -> GHCTargetVersion
                -> [T.Text]
                -> Excepts
                     '[ DigestError
@@ -182,7 +183,7 @@ testPackedGHC :: ( MonadMask m
                  )
               => FilePath          -- ^ Path to the packed GHC bindist
               -> Maybe TarDir      -- ^ Subdir of the archive
-              -> Version           -- ^ The GHC version
+              -> GHCTargetVersion  -- ^ The GHC version
               -> [T.Text]          -- ^ additional make args
               -> Excepts
                    '[ ArchiveResult, UnknownArchive, TarDirDoesNotExist, TestFailed ] m ()
@@ -208,19 +209,21 @@ testUnpackedGHC :: ( MonadReader env m
                    , MonadIO m
                    )
                 => GHCupPath         -- ^ Path to the unpacked GHC bindist (where the make file resides)
-                -> Version           -- ^ The GHC version
+                -> GHCTargetVersion  -- ^ The GHC version
                 -> [T.Text]          -- ^ additional configure args for bindist
                 -> Excepts '[ProcessError] m ()
-testUnpackedGHC path ver addMakeArgs = do
-  lift $ logInfo $ "Testing GHC version " <> prettyVer ver <> "!"
-  ghcDir <- lift $ ghcupGHCDir (mkTVer ver)
+testUnpackedGHC path tver addMakeArgs = do
+  lift $ logInfo $ "Testing GHC version " <> tVerToText tver <> "!"
+  ghcDir <- lift $ ghcupGHCDir tver
   let ghcBinDir = fromGHCupPath ghcDir </> "bin"
   env <- liftIO $ addToPath ghcBinDir False
 
   lEM $ make' (fmap T.unpack addMakeArgs)
               (Just $ fromGHCupPath path)
               "ghc-test"
-              (Just $ ("STAGE1_GHC", "ghc-" <> T.unpack (prettyVer ver)) : env)
+              (Just $ ("STAGE1_GHC", maybe "" (T.unpack . (<> "-")) (_tvTarget tver)
+                                     <> "ghc-"
+                                     <> T.unpack (prettyVer $ _tvVersion tver)) : env)
   pure ()
 
 
@@ -243,7 +246,7 @@ fetchGHCSrc :: ( MonadFail m
                , MonadIO m
                , MonadUnliftIO m
                )
-            => Version
+            => GHCTargetVersion
             -> Maybe FilePath
             -> Excepts
                  '[ DigestError
@@ -258,7 +261,7 @@ fetchGHCSrc v mfp = do
   GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
   dlInfo <-
     preview (ix GHC % ix v % viSourceDL % _Just) dls
-      ?? NoDownload
+      ?? NoDownload v GHC Nothing
   liftE $ downloadCached' dlInfo Nothing mfp
 
 
@@ -283,7 +286,7 @@ installGHCBindist :: ( MonadFail m
                      , MonadUnliftIO m
                      )
                   => DownloadInfo    -- ^ where/how to download
-                  -> Version         -- ^ the version to install
+                  -> GHCTargetVersion -- ^ the version to install
                   -> InstallDir
                   -> Bool            -- ^ Force install
                   -> [T.Text]        -- ^ additional configure args for bindist
@@ -306,10 +309,8 @@ installGHCBindist :: ( MonadFail m
                         ]
                        m
                        ()
-installGHCBindist dlinfo ver installDir forceInstall addConfArgs = do
-  let tver = mkTVer ver
-
-  lift $ logDebug $ "Requested to install GHC with " <> prettyVer ver
+installGHCBindist dlinfo tver installDir forceInstall addConfArgs = do
+  lift $ logDebug $ "Requested to install GHC with " <> tVerToText tver
 
   regularGHCInstalled <- lift $ ghcInstalled tver
 
@@ -317,7 +318,7 @@ installGHCBindist dlinfo ver installDir forceInstall addConfArgs = do
     | not forceInstall
     , regularGHCInstalled
     , GHCupInternal <- installDir -> do
-        throwE $ AlreadyInstalled GHC ver
+        throwE $ AlreadyInstalled GHC (_tvVersion tver)
 
     | forceInstall
     , regularGHCInstalled
@@ -336,12 +337,12 @@ installGHCBindist dlinfo ver installDir forceInstall addConfArgs = do
   case installDir of
     IsolateDir isoDir -> do                        -- isolated install
       lift $ logInfo $ "isolated installing GHC to " <> T.pack isoDir
-      liftE $ installPackedGHC dl (view dlSubdir dlinfo) (IsolateDirResolved isoDir) ver forceInstall addConfArgs
+      liftE $ installPackedGHC dl (view dlSubdir dlinfo) (IsolateDirResolved isoDir) tver forceInstall addConfArgs
     GHCupInternal -> do                            -- regular install
       -- prepare paths
       ghcdir <- lift $ ghcupGHCDir tver
 
-      liftE $ installPackedGHC dl (view dlSubdir dlinfo) (GHCupDir ghcdir) ver forceInstall addConfArgs
+      liftE $ installPackedGHC dl (view dlSubdir dlinfo) (GHCupDir ghcdir) tver forceInstall addConfArgs
 
       -- make symlinks & stuff when regular install,
       liftE $ postGHCInstall tver
@@ -375,7 +376,7 @@ installPackedGHC :: ( MonadMask m
                  => FilePath          -- ^ Path to the packed GHC bindist
                  -> Maybe TarDir      -- ^ Subdir of the archive
                  -> InstallDirResolved
-                 -> Version           -- ^ The GHC version
+                 -> GHCTargetVersion  -- ^ The GHC version
                  -> Bool              -- ^ Force install
                  -> [T.Text]          -- ^ additional configure args for bindist
                  -> Excepts
@@ -423,26 +424,22 @@ installUnpackedGHC :: ( MonadReader env m
                       )
                    => GHCupPath           -- ^ Path to the unpacked GHC bindist (where the configure script resides)
                    -> InstallDirResolved  -- ^ Path to install to
-                   -> Version             -- ^ The GHC version
+                   -> GHCTargetVersion    -- ^ The GHC version
                    -> Bool                -- ^ Force install
                    -> [T.Text]          -- ^ additional configure args for bindist
                    -> Excepts '[ProcessError, MergeFileTreeError] m ()
-installUnpackedGHC path inst ver forceInstall addConfArgs
+installUnpackedGHC path inst tver forceInstall addConfArgs
   | isWindows = do
       lift $ logInfo "Installing GHC (this may take a while)"
       -- Windows bindists are relocatable and don't need
       -- to run configure.
       -- We also must make sure to preserve mtime to not confuse ghc-pkg.
-      liftE $ mergeFileTree path inst GHC (mkTVer ver) $ \source dest -> do
-        mtime <- liftIO $ ifM (pathIsSymbolicLink source) (pure Nothing) (Just <$> getModificationTime source)
-        when forceInstall $ hideError doesNotExistErrorType $ hideError InappropriateType $ recycleFile dest
-        liftIO $ moveFilePortable source dest
-        forM_ mtime $ liftIO . setModificationTime dest
+      liftE $ mergeGHCFileTree path inst tver forceInstall
   | otherwise = do
       PlatformRequest {..} <- lift getPlatformReq
 
       let ldOverride
-           | ver >= [vver|8.2.2|]
+           | _tvVersion tver >= [vver|8.2.2|]
            , _rPlatform `elem` [Linux Alpine, Darwin]
            = ["--disable-ld-override"]
            | otherwise
@@ -451,7 +448,7 @@ installUnpackedGHC path inst ver forceInstall addConfArgs
       lift $ logInfo "Installing GHC (this may take a while)"
       lEM $ execLogged "sh"
                        ("./configure" : ("--prefix=" <> fromInstallDir inst)
-                        : (ldOverride <> (T.unpack <$> addConfArgs))
+                        : (maybe mempty (\x -> ["--target=" <> T.unpack x]) (_tvTarget tver) <> ldOverride <> (T.unpack <$> addConfArgs))
                        )
                        (Just $ fromGHCupPath path)
                        "ghc-configure"
@@ -459,17 +456,44 @@ installUnpackedGHC path inst ver forceInstall addConfArgs
       tmpInstallDest <- lift withGHCupTmpDir
       lEM $ make ["DESTDIR=" <> fromGHCupPath tmpInstallDest, "install"] (Just $ fromGHCupPath path)
       liftE $ catchWarn $ lEM @_ @'[ProcessError] $ darwinNotarization _rPlatform (fromGHCupPath tmpInstallDest)
-      liftE $ mergeFileTree (tmpInstallDest `appendGHCupPath` dropDrive (fromInstallDir inst))
+      liftE $ mergeGHCFileTree (tmpInstallDest `appendGHCupPath` dropDrive (fromInstallDir inst)) inst tver forceInstall
+      pure ()
+
+
+mergeGHCFileTree :: ( MonadReader env m
+                    , HasPlatformReq env
+                    , HasDirs env
+                    , HasSettings env
+                    , MonadThrow m
+                    , HasLog env
+                    , MonadIO m
+                    , MonadUnliftIO m
+                    , MonadMask m
+                    , MonadResource m
+                    , MonadFail m
+                    )
+                 => GHCupPath           -- ^ Path to the root of the tree
+                 -> InstallDirResolved  -- ^ Path to install to
+                 -> GHCTargetVersion    -- ^ The GHC version
+                 -> Bool                -- ^ Force install
+                 -> Excepts '[MergeFileTreeError] m ()
+mergeGHCFileTree root inst tver forceInstall
+  | isWindows = do
+      liftE $ mergeFileTree root inst GHC tver $ \source dest -> do
+        mtime <- liftIO $ ifM (pathIsSymbolicLink source) (pure Nothing) (Just <$> getModificationTime source)
+        when forceInstall $ hideError doesNotExistErrorType $ hideError InappropriateType $ recycleFile dest
+        liftIO $ moveFilePortable source dest
+        forM_ mtime $ liftIO . setModificationTime dest
+  | otherwise = do
+      liftE $ mergeFileTree root
         inst
         GHC
-        (mkTVer ver)
+        tver
         (\f t -> liftIO $ do
             mtime <- ifM (pathIsSymbolicLink f) (pure Nothing) (Just <$> getModificationTime f)
             install f t (not forceInstall)
             forM_ mtime $ setModificationTime t)
 
-      pure ()
-
 
 -- | Installs GHC into @~\/.ghcup\/ghc/\<ver\>@ and places the
 -- following symlinks in @~\/.ghcup\/bin@:
@@ -489,7 +513,7 @@ installGHCBin :: ( MonadFail m
                  , MonadIO m
                  , MonadUnliftIO m
                  )
-              => Version         -- ^ the version to install
+              => GHCTargetVersion -- ^ the version to install
               -> InstallDir
               -> Bool            -- ^ force install
               -> [T.Text]        -- ^ additional configure args for bindist
@@ -512,9 +536,9 @@ installGHCBin :: ( MonadFail m
                     ]
                    m
                    ()
-installGHCBin ver installDir forceInstall addConfArgs = do
-  dlinfo <- liftE $ getDownloadInfo GHC ver
-  liftE $ installGHCBindist dlinfo ver installDir forceInstall addConfArgs
+installGHCBin tver installDir forceInstall addConfArgs = do
+  dlinfo <- liftE $ getDownloadInfo' GHC tver
+  liftE $ installGHCBindist dlinfo tver installDir forceInstall addConfArgs
 
 
 
@@ -708,7 +732,7 @@ rmGHCVer ver = do
     Just files -> do
       lift $ logInfo $ "Removing files safely from: " <> T.pack dir
       forM_ files (lift . hideError NoSuchThing . recycleFile . (\f -> dir </> dropDrive f))
-      removeEmptyDirsRecursive dir
+      hideError UnsatisfiedConstraints $ removeEmptyDirsRecursive dir
       survivors <- liftIO $ hideErrorDef [doesNotExistErrorType] [] $ listDirectory dir
       f <- recordedInstallationFile GHC ver
       lift $ recycleFile f
@@ -755,7 +779,8 @@ compileGHC :: ( MonadMask m
               , MonadUnliftIO m
               , MonadFail m
               )
-           => GHCVer GHCTargetVersion
+           => GHCVer
+           -> Maybe Text               -- ^ cross target
            -> Maybe Version            -- ^ overwrite version
            -> Either Version FilePath  -- ^ version to bootstrap with
            -> Maybe Int                -- ^ jobs
@@ -763,7 +788,7 @@ compileGHC :: ( MonadMask m
            -> Maybe (Either FilePath [URI])  -- ^ patches
            -> [Text]                   -- ^ additional args to ./configure
            -> Maybe String             -- ^ build flavour
-           -> Bool
+           -> Maybe BuildSystem
            -> InstallDir
            -> Excepts
                 '[ AlreadyInstalled
@@ -792,20 +817,21 @@ compileGHC :: ( MonadMask m
                  ]
                 m
                 GHCTargetVersion
-compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadrian installDir
+compileGHC targetGhc crossTarget ov bstrap jobs mbuildConfig patches aargs buildFlavour buildSystem installDir
   = do
-    PlatformRequest { .. } <- lift getPlatformReq
+    pfreq@PlatformRequest { .. } <- lift getPlatformReq
     GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
 
     (workdir, tmpUnpack, tver) <- case targetGhc of
       -- unpack from version tarball
-      SourceDist tver -> do
-        lift $ logDebug $ "Requested to compile: " <> tVerToText tver <> " with " <> either prettyVer T.pack bstrap
+      SourceDist ver -> do
+        lift $ logDebug $ "Requested to compile: " <> prettyVer ver <> " with " <> either prettyVer T.pack bstrap
 
         -- download source tarball
+        let tver = mkTVer ver
         dlInfo <-
-          preview (ix GHC % ix (tver ^. tvVersion) % viSourceDL % _Just) dls
-            ?? NoDownload
+          preview (ix GHC % ix tver % viSourceDL % _Just) dls
+            ?? NoDownload tver GHC (Just pfreq)
         dl <- liftE $ downloadCached dlInfo Nothing
 
         -- unpack
@@ -818,7 +844,7 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
                          (view dlSubdir dlInfo)
         liftE $ applyAnyPatch patches (fromGHCupPath workdir)
 
-        pure (workdir, tmpUnpack, Just tver)
+        pure (workdir, tmpUnpack, Just (GHCTargetVersion crossTarget ver))
 
       RemoteDist uri -> do
         lift $ logDebug $ "Requested to compile (from uri): " <> T.pack (show uri)
@@ -842,7 +868,7 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
 
         let workdir = appendGHCupPath tmpUnpack (takeDirectory bf)
 
-        pure (workdir, tmpUnpack, mkTVer <$> tver)
+        pure (workdir, tmpUnpack, GHCTargetVersion crossTarget <$> tver)
 
       -- clone from git
       GitDist GitBranch{..} -> do
@@ -899,12 +925,12 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
 
           pure tver
 
-        pure (tmpUnpack, tmpUnpack, mkTVer <$> tver)
+        pure (tmpUnpack, tmpUnpack, GHCTargetVersion crossTarget <$> tver)
     -- the version that's installed may differ from the
     -- compiled version, so the user can overwrite it
-    installVer <- if | Just ov'   <- ov   -> pure (mkTVer ov')
+    installVer <- if | Just ov'   <- ov   -> pure (GHCTargetVersion crossTarget ov')
                      | Just tver' <- tver -> pure tver'
-                     | otherwise          -> fail "Newer GHCs don't support discovering the version in git. Complain to GHC devs: https://gitlab.haskell.org/ghc/ghc/-/issues/22322"
+                     | otherwise          -> fail "No GHC version given and couldn't detect version. Giving up..."
 
     alreadyInstalled <- lift $ ghcInstalled installVer
     alreadySet <- fmap (== Just installVer) $ lift $ ghcSet (_tvTarget installVer)
@@ -923,16 +949,31 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
       IsolateDir isoDir -> pure $ IsolateDirResolved isoDir
       GHCupInternal -> GHCupDir <$> lift (ghcupGHCDir installVer)
 
-    (mBindist, bmk) <- liftE $ runBuildAction
+    mBindist <- liftE $ runBuildAction
       tmpUnpack
       (do
-        b <- if hadrian
-             -- prefer 'tver', because the real version carries out compatibility checks
-             -- we don't want the user to do funny things with it
-             then compileHadrianBindist (fromMaybe installVer tver) (fromGHCupPath workdir) ghcdir
-             else compileMakeBindist (fromMaybe installVer tver) (fromGHCupPath workdir) ghcdir
-        bmk <- liftIO $ handleIO (\_ -> pure "") $ B.readFile (build_mk $ fromGHCupPath workdir)
-        pure (b, bmk)
+        -- prefer 'tver', because the real version carries out compatibility checks
+        -- we don't want the user to do funny things with it
+        let doHadrian = compileHadrianBindist (fromMaybe installVer tver) (fromGHCupPath workdir) ghcdir
+            doMake    = compileMakeBindist (fromMaybe installVer tver) (fromGHCupPath workdir) ghcdir
+        case buildSystem of
+          Just Hadrian -> do
+            lift $ logInfo "Requested to use Hadrian"
+            liftE doHadrian
+          Just Make -> do
+            lift $ logInfo "Requested to use Make"
+            doMake
+          Nothing -> do
+            supportsHadrian <- liftE $ catchE @HadrianNotFound @'[HadrianNotFound] @'[] (\_ -> return False)
+                                 $ fmap (const True)
+                                 $ findHadrianFile (fromGHCupPath workdir)
+            if supportsHadrian
+            then do
+              lift $ logInfo "Detected Hadrian"
+              liftE doHadrian
+            else do
+              lift $ logInfo "Detected Make"
+              doMake
       )
 
     case installDir of
@@ -948,12 +989,10 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
       liftE $ installPackedGHC bindist
                                (Just $ RegexDir "ghc-.*")
                                ghcdir
-                               (installVer ^. tvVersion)
+                               installVer
                                False       -- not a force install, since we already overwrite when compiling.
                                []
 
-    liftIO $ B.writeFile (fromInstallDir ghcdir </> ghcUpSrcBuiltFile) bmk
-
     case installDir of
       -- set and make symlinks for regular (non-isolated) installs
       GHCupInternal -> do
@@ -976,20 +1015,29 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
             => GHCupPath
             -> Excepts '[ProcessError, ParseError] m Version
   getGHCVer tmpUnpack = do
-    lEM $ execWithGhcEnv "python3" ["./boot"] (Just $ fromGHCupPath tmpUnpack) "ghc-bootstrap"
-    lEM $ execWithGhcEnv "sh" ["./configure"] (Just $ fromGHCupPath tmpUnpack) "ghc-bootstrap"
-    CapturedProcess {..} <- lift $ makeOut
-      ["show!", "--quiet", "VALUE=ProjectVersion" ] (Just $ fromGHCupPath tmpUnpack)
-    case _exitCode of
-      ExitSuccess -> either (throwE . ParseError . show) pure . MP.parse ghcProjectVersion "" . T.pack . stripNewlineEnd . T.unpack . decUTF8Safe' $ _stdOut
-      ExitFailure c -> throwE $ NonZeroExit c "make" ["show!", "--quiet", "VALUE=ProjectVersion" ]
+    lEM $ execLogged "python3" ["./boot"] (Just $ fromGHCupPath tmpUnpack) "ghc-bootstrap" Nothing
+    lEM $ configureWithGhcBoot Nothing [] (Just $ fromGHCupPath tmpUnpack) "ghc-bootstrap"
+    let versionFile = fromGHCupPath tmpUnpack </> "VERSION"
+    hasVersionFile <- liftIO $ doesFileExist versionFile
+    if hasVersionFile
+    then do
+      lift $ logDebug "Detected VERSION file, trying to extract"
+      contents <- liftIO $ readFile versionFile
+      either (throwE . ParseError . show) pure . MP.parse version' "" . T.pack . stripNewlineEnd $ contents
+    else do
+      lift $ logDebug "Didn't detect VERSION file, trying to extract via legacy 'make'"
+      CapturedProcess {..} <- lift $ makeOut
+        ["show!", "--quiet", "VALUE=ProjectVersion" ] (Just $ fromGHCupPath tmpUnpack)
+      case _exitCode of
+        ExitSuccess -> either (throwE . ParseError . show) pure . MP.parse ghcProjectVersion "" . T.pack . stripNewlineEnd . T.unpack . decUTF8Safe' $ _stdOut
+        ExitFailure c -> throwE $ NonZeroExit c "make" ["show!", "--quiet", "VALUE=ProjectVersion" ]
 
   defaultConf =
     let cross_mk = $(LitE . StringL <$> (qAddDependentFile "data/build_mk/cross" >> runIO (readFile "data/build_mk/cross")))
         default_mk = $(LitE . StringL <$> (qAddDependentFile "data/build_mk/default" >> runIO (readFile "data/build_mk/default")))
-    in case targetGhc of
-         SourceDist (GHCTargetVersion (Just _) _) -> cross_mk
-         _ -> default_mk
+    in case crossTarget of
+         Just _ -> cross_mk
+         _      -> default_mk
 
   compileHadrianBindist :: ( MonadReader env m
                            , HasDirs env
@@ -1015,18 +1063,17 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
                              m
                              (Maybe FilePath)  -- ^ output path of bindist, None for cross
   compileHadrianBindist tver workdir ghcdir = do
-    lEM $ execWithGhcEnv "python3" ["./boot"] (Just workdir) "ghc-bootstrap"
-
     liftE $ configureBindist tver workdir ghcdir
 
     lift $ logInfo "Building (this may take a while)..."
     hadrian_build <- liftE $ findHadrianFile workdir
-    lEM $ execWithGhcEnv hadrian_build
+    lEM $ execLogged hadrian_build
                           ( maybe [] (\j  -> ["-j" <> show j]         ) jobs
                          ++ maybe [] (\bf -> ["--flavour=" <> bf]) buildFlavour
                          ++ ["binary-dist"]
                           )
                           (Just workdir) "ghc-make"
+                          Nothing
     [tar] <- liftIO $ findFiles
       (workdir </> "_build" </> "bindist")
       (makeRegexOpts compExtended
@@ -1059,6 +1106,9 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
                         , HasLog env
                         , MonadIO m
                         , MonadFail m
+                        , MonadMask m
+                        , MonadUnliftIO m
+                        , MonadResource m
                         )
                      => GHCTargetVersion
                      -> FilePath
@@ -1070,6 +1120,7 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
                            , PatchFailed
                            , ProcessError
                            , NotFoundInPATH
+                           , MergeFileTreeError
                            , CopyError]
                           m
                        (Maybe FilePath)  -- ^ output path of bindist, None for cross
@@ -1091,7 +1142,9 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
 
     if | isCross tver -> do
           lift $ logInfo "Installing cross toolchain..."
-          lEM $ make ["install"] (Just workdir)
+          tmpInstallDest <- lift withGHCupTmpDir
+          lEM $ make ["DESTDIR=" <> fromGHCupPath tmpInstallDest, "install"] (Just workdir)
+          liftE $ mergeGHCFileTree (tmpInstallDest `appendGHCupPath` dropDrive (fromInstallDir ghcdir)) ghcdir tver True
           pure Nothing
        | otherwise -> do
           lift $ logInfo "Creating bindist..."
@@ -1164,8 +1217,8 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
     let lines' = fmap T.strip . T.lines $ decUTF8Safe c
 
    -- for cross, we need Stage1Only
-    case targetGhc of
-      SourceDist (GHCTargetVersion (Just _) _) -> when ("Stage1Only = YES" `notElem` lines') $ throwE
+    case crossTarget of
+      Just _ -> when ("Stage1Only = YES" `notElem` lines') $ throwE
         (InvalidBuildConfig
           [s|Cross compiling needs to be a Stage1 build, add "Stage1Only = YES" to your config!|]
         )
@@ -1209,64 +1262,50 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
                         ()
   configureBindist tver workdir (fromInstallDir -> ghcdir) = do
     lift $ logInfo [s|configuring build|]
-
-    if | _tvVersion tver >= [vver|8.8.0|] -> do
-          lEM $ execWithGhcEnv
-            "sh"
-            ("./configure" :  maybe mempty
-                      (\x -> ["--target=" <> T.unpack x])
-                      (_tvTarget tver)
-            ++ ["--prefix=" <> ghcdir]
-            ++ (if isWindows then ["--enable-tarballs-autodownload"] else [])
-            ++ fmap T.unpack aargs
-            )
-            (Just workdir)
-            "ghc-conf"
-       | otherwise -> do
-        lEM $ execLogged
-          "sh"
-          (  [ "./configure", "--with-ghc=" <> either id id bghc
-             ]
-          ++ maybe mempty
-                   (\x -> ["--target=" <> T.unpack x])
-                   (_tvTarget tver)
-          ++ ["--prefix=" <> ghcdir]
-          ++ (if isWindows then ["--enable-tarballs-autodownload"] else [])
-          ++ fmap T.unpack aargs
-          )
-          (Just workdir)
-          "ghc-conf"
-          Nothing
+    lEM $ configureWithGhcBoot (Just tver)
+      (maybe mempty
+                (\x -> ["--target=" <> T.unpack x])
+                (_tvTarget tver)
+      ++ ["--prefix=" <> ghcdir]
+      ++ (if isWindows then ["--enable-tarballs-autodownload"] else [])
+      ++ fmap T.unpack aargs
+      )
+      (Just workdir)
+      "ghc-conf"
     pure ()
 
-  execWithGhcEnv :: ( MonadReader env m
-                    , HasSettings env
-                    , HasDirs env
-                    , HasLog env
-                    , MonadIO m
-                    , MonadThrow m)
-                 => FilePath         -- ^ thing to execute
-                 -> [String]         -- ^ args for the thing
-                 -> Maybe FilePath   -- ^ optionally chdir into this
-                 -> FilePath         -- ^ log filename (opened in append mode)
-                 -> m (Either ProcessError ())
-  execWithGhcEnv fp args dir logf = do
-    env <- ghcEnv
-    execLogged fp args dir logf (Just env)
+  configureWithGhcBoot :: ( MonadReader env m
+                          , HasSettings env
+                          , HasDirs env
+                          , HasLog env
+                          , MonadIO m
+                          , MonadThrow m)
+                       => Maybe GHCTargetVersion
+                       -> [String]         -- ^ args for configure
+                       -> Maybe FilePath   -- ^ optionally chdir into this
+                       -> FilePath         -- ^ log filename (opened in append mode)
+                       -> m (Either ProcessError ())
+  configureWithGhcBoot mtver args dir logf = do
+    let execNew = execLogged
+                    "sh"
+                    ("./configure" : ("GHC=" <> bghc) : args)
+                    dir
+                    logf
+                    Nothing
+        execOld = execLogged
+                   "sh"
+                   ("./configure" : ("--with-ghc=" <> bghc) : args)
+                   dir
+                   logf
+                   Nothing
+    if | Just tver <- mtver
+       , _tvVersion tver >= [vver|8.8.0|] -> execNew
+       | Nothing   <- mtver               -> execNew -- need some default for git checkouts where we don't know yet
+       | otherwise                        -> execOld
 
   bghc = case bstrap of
-           Right g    -> Right g
-           Left  bver -> Left ("ghc-" <> (T.unpack . prettyVer $ bver) <> exeExt)
-
-  ghcEnv :: (MonadThrow m, MonadIO m) => m [(String, String)]
-  ghcEnv = do
-    cEnv <- liftIO getEnvironment
-    bghcPath <- case bghc of
-      Right ghc' -> pure ghc'
-      Left  bver -> do
-        spaths <- liftIO getSearchPath
-        throwMaybeM (NotFoundInPATH bver) $ liftIO (searchPath spaths bver)
-    pure (("GHC", bghcPath) : cEnv)
+           Right g    -> g
+           Left  bver -> "ghc-" <> (T.unpack . prettyVer $ bver) <> exeExt
 
 
 

lib/GHCup/HLS.hs

@@ -43,6 +43,7 @@ import           Control.Monad.Trans.Resource
 import           Data.ByteString                ( ByteString )
 import           Data.Either
 import           Data.List
+import           Data.Ord
 import           Data.Maybe
 import           Data.String                    ( fromString )
 import           Data.Text                      ( Text )
@@ -74,6 +75,7 @@ data HLSVer = SourceDist Version
             | GitDist GitBranch
             | HackageDist Version
             | RemoteDist URI
+            deriving (Eq, Show)
 
 
 
@@ -353,7 +355,7 @@ compileHLS :: ( MonadMask m
                        , NotInstalled
                        ] m Version
 compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal updateCabal patches cabalArgs = do
-  PlatformRequest { .. } <- lift getPlatformReq
+  pfreq@PlatformRequest { .. } <- lift getPlatformReq
   GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
   Dirs { .. } <- lift getDirs
 
@@ -368,8 +370,8 @@ compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal upda
 
       -- download source tarball
       dlInfo <-
-        preview (ix HLS % ix tver % viSourceDL % _Just) dls
-          ?? NoDownload
+        preview (ix HLS % ix (mkTVer tver) % viSourceDL % _Just) dls
+          ?? NoDownload (mkTVer tver) HLS (Just pfreq)
       dl <- liftE $ downloadCached dlInfo Nothing
 
       -- unpack
@@ -704,7 +706,7 @@ rmHLSVer ver = do
   when (Just ver == isHlsSet) $ do
     -- set latest hls
     hlsVers <- lift $ fmap rights getInstalledHLSs
-    case headMay . reverse . sort $ hlsVers of
+    case headMay . sortBy (comparing Down) $ hlsVers of
       Just latestver -> liftE $ setHLS latestver SetHLSOnly Nothing
       Nothing        -> pure ()
 

lib/GHCup/List.hs

@@ -36,6 +36,7 @@ import           Data.Either
 import           Data.List
 import           Data.Maybe
 import           Data.Text                      ( Text )
+import           Data.Time.Calendar             ( Day )
 import           Data.Versions                hiding ( patch )
 import           Haskus.Utils.Variant.Excepts
 import           Optics
@@ -61,10 +62,10 @@ import qualified Data.Text                     as T
 
 
 -- | Filter data type for 'listVersions'.
-data ListCriteria = ListInstalled
-                  | ListSet
-                  | ListAvailable
-                  deriving Show
+data ListCriteria = ListInstalled  Bool
+                  | ListSet        Bool
+                  | ListAvailable  Bool
+                  deriving (Eq, Show)
 
 -- | A list result describes a single tool version
 -- and various of its properties.
@@ -75,16 +76,16 @@ data ListResult = ListResult
   , lTag       :: [Tag]
   , lInstalled :: Bool
   , lSet       :: Bool -- ^ currently active version
-  , fromSrc    :: Bool -- ^ compiled from source
   , lStray     :: Bool -- ^ not in download info
   , lNoBindist :: Bool -- ^ whether the version is available for this platform/arch
   , hlsPowered :: Bool
+  , lReleaseDay :: Maybe Day
   }
   deriving (Eq, Ord, Show)
 
 
 -- | Extract all available tool versions and their tags.
-availableToolVersions :: GHCupDownloads -> Tool -> Map.Map Version VersionInfo
+availableToolVersions :: GHCupDownloads -> Tool -> Map.Map GHCTargetVersion VersionInfo
 availableToolVersions av tool = view
   (at tool % non Map.empty)
   av
@@ -93,19 +94,22 @@ availableToolVersions av tool = view
 -- | List all versions from the download info, as well as stray
 -- versions.
 listVersions :: ( MonadCatch m
-                , HasLog env
-                , MonadThrow m
-                , HasLog env
-                , MonadIO m
-                , MonadReader env m
-                , HasDirs env
-                , HasPlatformReq env
-                , HasGHCupInfo env
-                )
-             => Maybe Tool
-             -> Maybe ListCriteria
-             -> m [ListResult]
-listVersions lt' criteria = do
+                             , HasLog env
+                             , MonadThrow m
+                             , HasLog env
+                             , MonadIO m
+                             , MonadReader env m
+                             , HasDirs env
+                             , HasPlatformReq env
+                             , HasGHCupInfo env
+                             )
+                          => Maybe Tool
+                          -> [ListCriteria]
+                          -> Bool
+                          -> Bool
+                          -> (Maybe Day, Maybe Day)
+                          -> m [ListResult]
+listVersions lt' criteria hideOld showNightly days = do
   -- some annoying work to avoid too much repeated IO
   cSet <- cabalSet
   cabals <- getInstalledCabals
@@ -129,13 +133,13 @@ listVersions lt' criteria = do
             slr <- strayGHCs avTools
             pure (sort (slr ++ lr))
           Cabal -> do
-            slr <- strayCabals avTools cSet cabals
+            slr <- strayCabals (Map.mapKeys _tvVersion avTools) cSet cabals
             pure (sort (slr ++ lr))
           HLS -> do
-            slr <- strayHLS avTools hlsSet' hlses
+            slr <- strayHLS (Map.mapKeys _tvVersion avTools) hlsSet' hlses
             pure (sort (slr ++ lr))
           Stack -> do
-            slr <- strayStacks avTools sSet stacks
+            slr <- strayStacks (Map.mapKeys _tvVersion avTools) sSet stacks
             pure (sort (slr ++ lr))
           GHCup -> do
             let cg = maybeToList $ currentGHCup avTools
@@ -154,42 +158,28 @@ listVersions lt' criteria = do
                , HasLog env
                , MonadIO m
                )
-            => Map.Map Version VersionInfo
+            => Map.Map GHCTargetVersion VersionInfo
             -> m [ListResult]
   strayGHCs avTools = do
     ghcs <- getInstalledGHCs
     fmap catMaybes $ forM ghcs $ \case
-      Right tver@GHCTargetVersion{ _tvTarget = Nothing, .. } -> do
-        case Map.lookup _tvVersion avTools of
+      Right tver@GHCTargetVersion{ .. } -> do
+        case Map.lookup tver avTools of
           Just _  -> pure Nothing
           Nothing -> do
-            lSet    <- fmap (maybe False (\(GHCTargetVersion _ v ) -> v == _tvVersion)) $ ghcSet Nothing
-            fromSrc <- ghcSrcInstalled tver
+            lSet    <- fmap (maybe False (\(GHCTargetVersion _ v ) -> v == _tvVersion)) $ ghcSet _tvTarget
             hlsPowered <- fmap (elem _tvVersion) hlsGHCVersions
             pure $ Just $ ListResult
               { lTool      = GHC
               , lVer       = _tvVersion
-              , lCross     = Nothing
+              , lCross     = _tvTarget
               , lTag       = []
               , lInstalled = True
-             , lStray     = isNothing (Map.lookup _tvVersion avTools)
+              , lStray     = isNothing (Map.lookup tver avTools)
               , lNoBindist = False
+              , lReleaseDay = Nothing
               , ..
               }
-      Right tver@GHCTargetVersion{ .. } -> do
-        lSet    <- fmap (maybe False (\(GHCTargetVersion _ v ) -> v == _tvVersion)) $ ghcSet _tvTarget
-        fromSrc <- ghcSrcInstalled tver
-        hlsPowered <- fmap (elem _tvVersion) hlsGHCVersions
-        pure $ Just $ ListResult
-          { lTool      = GHC
-          , lVer       = _tvVersion
-          , lCross     = _tvTarget
-          , lTag       = []
-          , lInstalled = True
-          , lStray     = True -- NOTE: cross currently cannot be installed via bindist
-          , lNoBindist = False
-          , ..
-          }
       Left e -> do
         logWarn
           $ "Could not parse version of stray directory" <> T.pack e
@@ -221,8 +211,8 @@ listVersions lt' criteria = do
               , lInstalled = True
               , lStray     = isNothing (Map.lookup ver avTools)
               , lNoBindist = False
-              , fromSrc    = False -- actually, we don't know :>
               , hlsPowered = False
+              , lReleaseDay = Nothing
               , ..
               }
       Left e -> do
@@ -255,8 +245,8 @@ listVersions lt' criteria = do
               , lInstalled = True
               , lStray     = isNothing (Map.lookup ver avTools)
               , lNoBindist = False
-              , fromSrc    = False -- actually, we don't know :>
               , hlsPowered = False
+              , lReleaseDay = Nothing
               , ..
               }
       Left e -> do
@@ -290,8 +280,8 @@ listVersions lt' criteria = do
               , lInstalled = True
               , lStray     = isNothing (Map.lookup ver avTools)
               , lNoBindist = False
-              , fromSrc    = False -- actually, we don't know :>
               , hlsPowered = False
+              , lReleaseDay = Nothing
               , ..
               }
       Left e -> do
@@ -299,24 +289,24 @@ listVersions lt' criteria = do
           $ "Could not parse version of stray directory" <> T.pack e
         pure Nothing
 
-  currentGHCup :: Map.Map Version VersionInfo -> Maybe ListResult
+  currentGHCup :: Map.Map GHCTargetVersion VersionInfo -> Maybe ListResult
   currentGHCup av =
-    let currentVer = fromJust $ pvpToVersion ghcUpVer ""
+    let currentVer = mkTVer $ fromJust $ pvpToVersion ghcUpVer ""
         listVer    = Map.lookup currentVer av
         latestVer  = fst <$> headOf (getTagged Latest) av
         recommendedVer = fst <$> headOf (getTagged Latest) av
         isOld  = maybe True (> currentVer) latestVer && maybe True (> currentVer) recommendedVer
     in if | Map.member currentVer av -> Nothing
-          | otherwise -> Just $ ListResult { lVer    = currentVer
+          | otherwise -> Just $ ListResult { lVer    = _tvVersion currentVer
                                            , lTag    = maybe (if isOld then [Old] else []) _viTags listVer
                                            , lCross  = Nothing
                                            , lTool   = GHCup
-                                           , fromSrc = False
                                            , lStray  = isNothing listVer
                                            , lSet    = True
                                            , lInstalled = True
                                            , lNoBindist = False
                                            , hlsPowered = False
+                                           , lReleaseDay = Nothing
                                            }
 
   -- NOTE: this are not cross ones, because no bindists
@@ -335,42 +325,41 @@ listVersions lt' criteria = do
                -> [Either FilePath Version]
                -> Maybe Version
                -> [Either FilePath Version]
-               -> (Version, VersionInfo)
+               -> (GHCTargetVersion, VersionInfo)
                -> m ListResult
-  toListResult t cSet cabals hlsSet' hlses stackSet' stacks (v, _viTags -> tags) = do
+  toListResult t cSet cabals hlsSet' hlses stackSet' stacks (tver, VersionInfo{..}) = do
+    let v = _tvVersion tver
     case t of
       GHC -> do
-        lNoBindist <- fmap (isLeft . veitherToEither) $ runE @'[NoDownload] $ getDownloadInfo GHC v
-        let tver = mkTVer v
-        lSet       <- fmap (maybe False (\(GHCTargetVersion _ v') -> v' == v)) $ ghcSet Nothing
+        lNoBindist <- fmap (isLeft . veitherToEither) $ runE @'[NoDownload] $ getDownloadInfo' GHC tver
+        lSet       <- fmap (== Just tver) $ ghcSet (_tvTarget tver)
         lInstalled <- ghcInstalled tver
-        fromSrc    <- ghcSrcInstalled tver
-        hlsPowered <- fmap (elem v) hlsGHCVersions
-        pure ListResult { lVer = v, lCross = Nothing , lTag = tags, lTool = t, lStray = False, .. }
+        hlsPowered <- fmap (elem tver) (fmap mkTVer <$> hlsGHCVersions)
+        pure ListResult { lVer = _tvVersion tver , lCross = _tvTarget tver , lTag = _viTags, lTool = t, lStray = False, lReleaseDay = _viReleaseDay, .. }
       Cabal -> do
         lNoBindist <- fmap (isLeft . veitherToEither) $ runE @'[NoDownload] $ getDownloadInfo Cabal v
         let lSet = cSet == Just v
         let lInstalled = elem v $ rights cabals
         pure ListResult { lVer    = v
                         , lCross  = Nothing
-                        , lTag    = tags
+                        , lTag    = _viTags
                         , lTool   = t
-                        , fromSrc = False
                         , lStray  = False
                         , hlsPowered = False
+                        , lReleaseDay = _viReleaseDay
                         , ..
                         }
       GHCup -> do
         let lSet       = prettyPVP ghcUpVer == prettyVer v
         let lInstalled = lSet
         pure ListResult { lVer    = v
-                        , lTag    = tags
+                        , lTag    = _viTags
                         , lCross  = Nothing
                         , lTool   = t
-                        , fromSrc = False
                         , lStray  = False
                         , lNoBindist = False
                         , hlsPowered = False
+                        , lReleaseDay = _viReleaseDay
                         , ..
                         }
       HLS -> do
@@ -379,11 +368,11 @@ listVersions lt' criteria = do
         let lInstalled = elem v $ rights hlses
         pure ListResult { lVer    = v
                         , lCross  = Nothing
-                        , lTag    = tags
+                        , lTag    = _viTags
                         , lTool   = t
-                        , fromSrc = False
                         , lStray  = False
                         , hlsPowered = False
+                        , lReleaseDay = _viReleaseDay
                         , ..
                         }
       Stack -> do
@@ -392,19 +381,42 @@ listVersions lt' criteria = do
         let lInstalled = elem v $ rights stacks
         pure ListResult { lVer    = v
                         , lCross  = Nothing
-                        , lTag    = tags
+                        , lTag    = _viTags
                         , lTool   = t
-                        , fromSrc = False
                         , lStray  = False
                         , hlsPowered = False
+                        , lReleaseDay = _viReleaseDay
                         , ..
                         }
 
 
   filter' :: [ListResult] -> [ListResult]
-  filter' lr = case criteria of
-    Nothing            -> lr
-    Just ListInstalled -> filter (\ListResult {..} -> lInstalled) lr
-    Just ListSet       -> filter (\ListResult {..} -> lSet) lr
-    Just ListAvailable -> filter (\ListResult {..} -> not lNoBindist) lr
+  filter' = filterNightly . filterOld . filter (\lr -> foldr (\a b -> fromCriteria a lr && b) True criteria) . filterDays
+
+  filterDays :: [ListResult] -> [ListResult]
+  filterDays lrs = case days of
+                     (Nothing, Nothing)    -> lrs
+                     (Just from, Just to') -> filter (\ListResult{..} -> maybe False (\d -> d >= from && d <= to') lReleaseDay) lrs
+                     (Nothing, Just to')   -> filter (\ListResult{..} -> maybe False (<= to')                      lReleaseDay) lrs
+                     (Just from, Nothing)  -> filter (\ListResult{..} -> maybe False (>= from)                     lReleaseDay) lrs
+
+  fromCriteria :: ListCriteria -> ListResult -> Bool
+  fromCriteria lc ListResult{..} = case lc of
+    ListInstalled  b -> f b lInstalled
+    ListSet        b -> f b lSet
+    ListAvailable  b -> f b $ not lNoBindist
+   where
+    f b
+      | b         = id
+      | otherwise = not
+
+  filterOld :: [ListResult] -> [ListResult]
+  filterOld lr
+    | hideOld   = filter (\ListResult {..} -> lInstalled || Old `notElem` lTag) lr
+    | otherwise = lr
+
+  filterNightly :: [ListResult] -> [ListResult]
+  filterNightly lr
+    | showNightly = lr
+    | otherwise   = filter (\ListResult {..} -> lInstalled || (Nightly `notElem` lTag && LatestNightly `notElem` lTag)) lr
 

lib/GHCup/Prelude.hs

@@ -77,8 +77,14 @@ runBothE' a1 a2 = do
       (_       , VLeft e ) -> throwSomeE e
       (VRight _, VRight _) -> pure ()
 
+-- "throwSomeE" function has been upstreamed in haskus-utils-variant-3.3
+-- So, only conditionally include this shim if
+-- haskus-utils-variant version is < 3.3
 
+#if MIN_VERSION_haskus_utils_variant(3,3,0)
+#else
 -- | Throw some exception
 throwSomeE :: forall es' es a m. (Monad m, LiftVariant es' es) => V es' -> Excepts es m a
 {-# INLINABLE throwSomeE #-}
 throwSomeE = Excepts . pure . VLeft . liftVariant
+#endif

lib/GHCup/Prelude/File/Posix.hs

@@ -279,11 +279,11 @@ removeEmptyDirectory = PD.removeDirectory
 
 -- | Create an 'Unfold' of directory contents.
 unfoldDirContents :: (MonadMask m, MonadIO m, S.MonadAsync m) => Unfold m FilePath (FD.DirType, FilePath)
-unfoldDirContents = U.bracket (liftIO . openDirStream) (liftIO . closeDirStream) (Unfold step return)
+unfoldDirContents = U.bracket (liftIO . openDirStreamPortable) (liftIO . closeDirStreamPortable) (Unfold step return)
  where
   {-# INLINE [0] step #-}
   step dirstream = do
-    (typ, e) <- liftIO $ readDirEnt dirstream
+    (typ, e) <- liftIO $ readDirEntPortable dirstream
     return $ if
       | null e    -> D.Stop
       | "." == e  -> D.Skip dirstream
@@ -308,8 +308,8 @@ getDirectoryContentsRecursiveUnfold = Unfold step (\s -> return (s, Nothing, [""
   step (_, Nothing, []) = return D.Stop
 
   step (topdir, Just (cdir, dirstream, finalizer), dirs) = flip onException (runIOFinalizer finalizer) $ do
-    (dt, f) <- liftIO $ readDirEnt dirstream
-    if | FD.dtUnknown == dt -> do
+    (dt, f) <- liftIO $ readDirEntPortable dirstream
+    if | f == "" -> do
            runIOFinalizer finalizer
            return $ D.Skip (topdir, Nothing, dirs)
        | f == "." || f == ".."
@@ -323,8 +323,8 @@ getDirectoryContentsRecursiveUnfold = Unfold step (\s -> return (s, Nothing, [""
 
   acquire dir =
     withRunInIO $ \run -> mask_ $ run $ do
-        dirstream <- liftIO $ openDirStream dir
-        ref <- newIOFinalizer (liftIO $ closeDirStream dirstream)
+        dirstream <- liftIO $ openDirStreamPortable dir
+        ref <- newIOFinalizer (liftIO $ closeDirStreamPortable dirstream)
         return (dirstream, ref)
 
 getDirectoryContentsRecursiveBFSUnsafe :: (MonadMask m, MonadIO m, S.MonadAsync m)

lib/GHCup/Prelude/File/Posix/Traversals.hsc

@@ -10,9 +10,20 @@
 module GHCup.Prelude.File.Posix.Traversals (
 -- lower-level stuff
   readDirEnt
+, readDirEntPortable
+, openDirStreamPortable
+, closeDirStreamPortable
 , unpackDirStream
+, DirStreamPortable
 ) where
 
+#include <limits.h>
+#include <stdlib.h>
+#include <dirent.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 
 #if __GLASGOW_HASKELL__ < 710
 import Control.Applicative ((<$>))
@@ -28,6 +39,7 @@ import Foreign.Storable
 import System.Posix
 import Foreign (alloca)
 import System.Posix.Internals (peekFilePath)
+import System.FilePath
 
 
 
@@ -90,3 +102,38 @@ readDirEnt (unpackDirStream -> dirp) =
                     then return (dtUnknown, mempty)
                     else throwErrno "readDirEnt"
 
+
+newtype DirStreamPortable = DirStreamPortable (FilePath, DirStream)
+
+openDirStreamPortable :: FilePath -> IO DirStreamPortable
+openDirStreamPortable fp = do
+  dirs <- openDirStream fp
+  pure $ DirStreamPortable (fp, dirs)
+
+closeDirStreamPortable :: DirStreamPortable -> IO ()
+closeDirStreamPortable (DirStreamPortable (_, dirs)) = closeDirStream dirs
+
+readDirEntPortable :: DirStreamPortable -> IO (DirType, FilePath)
+readDirEntPortable (DirStreamPortable (basedir, dirs)) = do
+  (dt, fp) <- readDirEnt dirs
+  case (dt, fp) of
+    (DirType #{const DT_BLK}, _)     -> pure (dt, fp)
+    (DirType #{const DT_CHR}, _)     -> pure (dt, fp)
+    (DirType #{const DT_DIR}, _)     -> pure (dt, fp)
+    (DirType #{const DT_FIFO}, _)    -> pure (dt, fp)
+    (DirType #{const DT_LNK}, _)     -> pure (dt, fp)
+    (DirType #{const DT_REG}, _)     -> pure (dt, fp)
+    (DirType #{const DT_SOCK}, _)    -> pure (dt, fp)
+    (_, _)
+      | fp /= "" -> do
+          stat <- getSymbolicLinkStatus (basedir </> fp)
+          pure $ (, fp) $ if | isBlockDevice stat     -> DirType #{const DT_BLK}
+                             | isCharacterDevice stat -> DirType #{const DT_CHR}
+                             | isDirectory stat       -> DirType #{const DT_DIR}
+                             | isNamedPipe stat       -> DirType #{const DT_FIFO}
+                             | isSymbolicLink stat    -> DirType #{const DT_LNK}
+                             | isRegularFile stat     -> DirType #{const DT_REG}
+                             | isSocket stat          -> DirType #{const DT_SOCK}
+                             | otherwise              -> DirType #{const DT_UNKNOWN}
+      | otherwise -> pure (dt, fp)
+

lib/GHCup/Stack.hs

@@ -38,6 +38,7 @@ import           Control.Monad.Trans.Resource
                                          hiding ( throwM )
 import           Data.Either
 import           Data.List
+import           Data.Ord
 import           Data.Maybe
 import           Data.Versions                hiding ( patch )
 import           Haskus.Utils.Variant.Excepts
@@ -279,6 +280,6 @@ rmStackVer ver = do
 
   when (Just ver == sSet) $ do
     sVers <- lift $ fmap rights getInstalledStacks
-    case headMay . reverse . sort $ sVers of
+    case headMay . sortBy (comparing Down) $ sVers of
       Just latestver -> setStack latestver
       Nothing        -> lift $ rmLink (binDir </> "stack" <> exeExt)

lib/GHCup/Types.hs

@@ -31,6 +31,7 @@ import {-# SOURCE #-} GHCup.Utils.Dirs          ( fromGHCupPath, GHCupPath )
 import           Control.DeepSeq                ( NFData, rnf )
 import           Data.Map.Strict                ( Map )
 import           Data.List.NonEmpty             ( NonEmpty (..) )
+import           Data.Time.Calendar             ( Day )
 import           Data.Text                      ( Text )
 import           Data.Versions
 import           GHC.IO.Exception               ( ExitCode )
@@ -44,7 +45,8 @@ import           Graphics.Vty                   ( Key(..) )
 import qualified Data.ByteString.Lazy          as BL
 import qualified Data.Text                     as T
 import qualified GHC.Generics                  as GHC
-
+import qualified Data.List.NonEmpty            as NE
+import           Data.Foldable                  (foldMap)
 
 #if !defined(BRICK)
 data Key = KEsc  | KChar Char | KBS | KEnter
@@ -66,7 +68,7 @@ data GHCupInfo = GHCupInfo
   , _ghcupDownloads   :: GHCupDownloads
   , _globalTools      :: Map GlobalTool DownloadInfo
   }
-  deriving (Show, GHC.Generic)
+  deriving (Show, GHC.Generic, Eq)
 
 instance NFData GHCupInfo
 
@@ -87,7 +89,7 @@ data Requirements = Requirements
   { _distroPKGs :: [Text]
   , _notes      :: Text
   }
-  deriving (Show, GHC.Generic)
+  deriving (Show, GHC.Generic, Eq)
 
 instance NFData Requirements
 
@@ -103,7 +105,7 @@ instance NFData Requirements
 -- | Description of all binary and source downloads. This is a tree
 -- of nested maps.
 type GHCupDownloads = Map Tool ToolVersionSpec
-type ToolVersionSpec = Map Version VersionInfo
+type ToolVersionSpec = Map GHCTargetVersion VersionInfo
 type ArchitectureSpec = Map Architecture PlatformSpec
 type PlatformSpec = Map Platform PlatformVersionSpec
 type PlatformVersionSpec = Map (Maybe VersionRange) DownloadInfo
@@ -131,11 +133,15 @@ data GlobalTool = ShimGen
 
 instance NFData GlobalTool
 
+instance Pretty GlobalTool where
+  pPrint ShimGen = text "shimgen"
+
 
 -- | All necessary information of a tool version, including
 -- source download and per-architecture downloads.
 data VersionInfo = VersionInfo
   { _viTags        :: [Tag]              -- ^ version specific tag
+  , _viReleaseDay  :: Maybe Day
   , _viChangeLog   :: Maybe URI
   , _viSourceDL    :: Maybe DownloadInfo -- ^ source tarball
   , _viTestDL      :: Maybe DownloadInfo -- ^ test tarball
@@ -154,6 +160,9 @@ instance NFData VersionInfo
 data Tag = Latest
          | Recommended
          | Prerelease
+         | LatestPrerelease
+         | Nightly
+         | LatestNightly
          | Base PVP
          | Old                -- ^ old versions are hidden by default in TUI
          | UnknownTag String  -- ^ used for upwardscompat
@@ -165,16 +174,22 @@ tagToString :: Tag -> String
 tagToString Recommended        = "recommended"
 tagToString Latest             = "latest"
 tagToString Prerelease         = "prerelease"
+tagToString Nightly            = "nightly"
 tagToString (Base       pvp'') = "base-" ++ T.unpack (prettyPVP pvp'')
 tagToString (UnknownTag t    ) = t
+tagToString LatestPrerelease   = "latest-prerelease"
+tagToString LatestNightly      = "latest-nightly"
 tagToString Old                = ""
 
 instance Pretty Tag where
   pPrint Recommended        = text "recommended"
   pPrint Latest             = text "latest"
   pPrint Prerelease         = text "prerelease"
+  pPrint Nightly            = text "nightly"
   pPrint (Base       pvp'') = text ("base-" ++ T.unpack (prettyPVP pvp''))
   pPrint (UnknownTag t    ) = text t
+  pPrint LatestPrerelease   = text "latest-prerelease"
+  pPrint LatestNightly   = text "latest-prerelease"
   pPrint Old                = mempty
 
 data Architecture = A_64
@@ -264,6 +279,7 @@ data DownloadInfo = DownloadInfo
   , _dlSubdir :: Maybe TarDir
   , _dlHash   :: Text
   , _dlCSize  :: Maybe Integer
+  , _dlOutput :: Maybe FilePath
   }
   deriving (Eq, Ord, GHC.Generic, Show)
 
@@ -414,7 +430,7 @@ data KeyBindings = KeyBindings
   deriving (Show, GHC.Generic)
 
 instance NFData KeyBindings
-#if defined(IS_WINDOWS)
+#if defined(IS_WINDOWS) || !defined(BRICK)
 instance NFData Key
 #endif
 
@@ -581,7 +597,9 @@ data GHCTargetVersion = GHCTargetVersion
   { _tvTarget  :: Maybe Text
   , _tvVersion :: Version
   }
-  deriving (Ord, Eq, Show)
+  deriving (Ord, Eq, Show, GHC.Generic)
+
+instance NFData GHCTargetVersion
 
 data GitBranch = GitBranch
   { ref  :: String
@@ -620,6 +638,17 @@ data VersionRange = SimpleRange (NonEmpty VersionCmp) -- And
 
 instance NFData VersionRange
 
+instance Pretty VersionCmp where
+  pPrint (VR_gt v) = text "> " <> pPrint v
+  pPrint (VR_gteq v) = text ">= " <> pPrint v
+  pPrint (VR_lt v) = text "< " <> pPrint v
+  pPrint (VR_lteq v) = text "<= " <> pPrint v
+  pPrint (VR_eq v) = text "= " <> pPrint v
+
+instance Pretty VersionRange where
+  pPrint (SimpleRange xs) = foldl1 (\x y -> x <> text " && " <> y) $ NE.map pPrint xs
+  pPrint (OrRange xs vr) = foldMap pPrint xs <> " || " <> pPrint vr
+
 instance Pretty Versioning where
   pPrint = text . T.unpack . prettyV
 
@@ -691,3 +720,21 @@ type PromptQuestion = Text
 
 data PromptResponse = PromptYes | PromptNo
   deriving (Show, Eq)
+
+data ToolVersion = GHCVersion GHCTargetVersion
+                 | ToolVersion Version
+                 | ToolTag Tag
+                 | ToolDay Day
+                 deriving (Eq, Show)
+
+instance Pretty ToolVersion where
+  pPrint (GHCVersion v) = pPrint v
+  pPrint (ToolVersion v) = pPrint v
+  pPrint (ToolTag t) = pPrint t
+  pPrint (ToolDay d) = text (show d)
+
+
+
+data BuildSystem = Hadrian
+                 | Make
+  deriving (Show, Eq)

lib/GHCup/Types/JSON.hs

@@ -64,8 +64,11 @@ instance ToJSON Tag where
   toJSON Latest             = String "Latest"
   toJSON Recommended        = String "Recommended"
   toJSON Prerelease         = String "Prerelease"
+  toJSON Nightly            = String "Nightly"
   toJSON Old                = String "old"
   toJSON (Base       pvp'') = String ("base-" <> prettyPVP pvp'')
+  toJSON LatestPrerelease   = String "LatestPrerelease"
+  toJSON LatestNightly      = String "LatestNightly"
   toJSON (UnknownTag x    ) = String (T.pack x)
 
 instance FromJSON Tag where
@@ -73,6 +76,9 @@ instance FromJSON Tag where
     "Latest"                             -> pure Latest
     "Recommended"                        -> pure Recommended
     "Prerelease"                         -> pure Prerelease
+    "Nightly"                            -> pure Nightly
+    "LatestPrerelease"                   -> pure LatestPrerelease
+    "LatestNightly"                      -> pure LatestNightly
     "old"                                -> pure Old
     ('b' : 'a' : 's' : 'e' : '-' : ver') -> case pvp (T.pack ver') of
       Right x -> pure $ Base x
@@ -89,13 +95,29 @@ instance FromJSON URI where
       Right x -> pure x
       Left  e -> fail . show $ e
 
+instance ToJSON GHCTargetVersion where
+  toJSON = toJSON . tVerToText
+
+instance FromJSON GHCTargetVersion where
+  parseJSON = withText "GHCTargetVersion" $ \t -> case MP.parse ghcTargetVerP "" t of
+    Right x -> pure x
+    Left  e -> fail $ "Failure in GHCTargetVersion (FromJSON)" <> show e
+
+instance ToJSONKey GHCTargetVersion where
+  toJSONKey = toJSONKeyText $ \x -> tVerToText x
+
+instance FromJSONKey GHCTargetVersion where
+  fromJSONKey = FromJSONKeyTextParser $ \t -> case MP.parse ghcTargetVerP "" t of
+    Right x -> pure x
+    Left  e -> fail $ "Failure in GHCTargetVersion (FromJSONKey)" <> show e
+
 instance ToJSON Versioning where
   toJSON = toJSON . prettyV
 
 instance FromJSON Versioning where
   parseJSON = withText "Versioning" $ \t -> case versioning t of
     Right x -> pure x
-    Left  e -> fail $ "Failure in Version (FromJSON)" <> show e
+    Left  e -> fail $ "Failure in GHCTargetVersion (FromJSON)" <> show e
 
 instance ToJSONKey Versioning where
   toJSONKey = toJSONKeyText $ \x -> prettyV x

lib/GHCup/Utils.hs

@@ -62,7 +62,6 @@ import           Control.Monad.Trans.Resource
                                          hiding ( throwM )
 import           Control.Monad.IO.Unlift        ( MonadUnliftIO( withRunInIO ) )
 import           Data.Char                      ( isHexDigit )
-import           Data.Bifunctor                 ( first )
 import           Data.ByteString                ( ByteString )
 import           Data.Either
 import           Data.Foldable
@@ -94,6 +93,7 @@ import qualified Streamly.Prelude              as S
 import Control.DeepSeq (force)
 import GHC.IO (evaluate)
 import System.Environment (getEnvironment, setEnv)
+import Data.Time (Day(..), diffDays, addDays)
 
 
 -- $setup
@@ -288,13 +288,6 @@ ghcInstalled ver = do
   liftIO $ doesDirectoryExist (fromGHCupPath ghcdir)
 
 
--- | Whether the given GHC version is installed from source.
-ghcSrcInstalled :: (MonadIO m, MonadReader env m, HasDirs env, MonadThrow m) => GHCTargetVersion -> m Bool
-ghcSrcInstalled ver = do
-  ghcdir <- ghcupGHCDir ver
-  liftIO $ doesFileExist (fromGHCupPath ghcdir </> ghcUpSrcBuiltFile)
-
-
 -- | Whether the given GHC version is set as the current.
 ghcSet :: (MonadReader env m, HasDirs env, MonadThrow m, MonadIO m)
        => Maybe Text   -- ^ the target of the GHC version, if any
@@ -335,7 +328,7 @@ ghcSet mtarget = do
 getInstalledGHCs :: (MonadReader env m, HasDirs env, MonadIO m) => m [Either FilePath GHCTargetVersion]
 getInstalledGHCs = do
   ghcdir <- ghcupGHCBaseDir
-  fs     <- liftIO $ hideErrorDef [NoSuchThing] [] $ listDirectory (fromGHCupPath ghcdir)
+  fs     <- liftIO $ hideErrorDef [NoSuchThing] [] $ listDirectoryDirs (fromGHCupPath ghcdir)
   forM fs $ \f -> case parseGHCupGHCDir f of
     Right r -> pure $ Right r
     Left  _ -> pure $ Left f
@@ -376,7 +369,9 @@ cabalSet = do
   handleIO' NoSuchThing (\_ -> pure Nothing) $ do
     broken <- liftIO $ isBrokenSymlink cabalbin
     if broken
-      then pure Nothing
+      then do
+        logWarn $ "Broken symlink at " <> T.pack cabalbin
+        pure Nothing
       else do
         link <- liftIO
           $ handleIO' InvalidArgument
@@ -438,7 +433,7 @@ getInstalledHLSs = do
         Nothing        -> pure $ Left f
 
   hlsdir <- ghcupHLSBaseDir
-  fs     <- liftIO $ hideErrorDef [NoSuchThing] [] $ listDirectory (fromGHCupPath hlsdir)
+  fs     <- liftIO $ hideErrorDef [NoSuchThing] [] $ listDirectoryDirs (fromGHCupPath hlsdir)
   new <- forM fs $ \f -> case parseGHCupHLSDir f of
     Right r -> pure $ Right r
     Left  _ -> pure $ Left f
@@ -473,7 +468,9 @@ stackSet = do
   handleIO' NoSuchThing (\_ -> pure Nothing) $ do
     broken <- liftIO $ isBrokenSymlink stackBin
     if broken
-      then pure Nothing
+      then do
+        logWarn $ "Broken symlink at " <> T.pack stackBin
+        pure Nothing
       else do
         link <- liftIO
           $ handleIO' InvalidArgument
@@ -527,15 +524,17 @@ isLegacyHLS ver = do
 
 
 -- Return the currently set hls version, if any.
-hlsSet :: (MonadReader env m, HasDirs env, MonadIO m, MonadThrow m, MonadCatch m) => m (Maybe Version)
+hlsSet :: (HasLog env, MonadReader env m, HasDirs env, MonadIO m, MonadThrow m, MonadCatch m) => m (Maybe Version)
 hlsSet = do
   Dirs {..}  <- getDirs
   let hlsBin = binDir </> "haskell-language-server-wrapper" <> exeExt
 
-  liftIO $ handleIO' NoSuchThing (\_ -> pure Nothing) $ do
-    broken <- isBrokenSymlink hlsBin
+  handleIO' NoSuchThing (\_ -> pure Nothing) $ do
+    broken <- liftIO $ isBrokenSymlink hlsBin
     if broken
-      then pure Nothing
+      then do
+        logWarn $ "Broken symlink at " <> T.pack hlsBin
+        pure Nothing
       else do
         link <- liftIO $ getLinkTarget hlsBin
         Just <$> linkVersion link
@@ -563,6 +562,7 @@ hlsSet = do
 -- | Return the GHC versions the currently selected HLS supports.
 hlsGHCVersions :: ( MonadReader env m
                   , HasDirs env
+                  , HasLog env
                   , MonadIO m
                   , MonadThrow m
                   , MonadCatch m
@@ -626,7 +626,7 @@ hlsInternalServerScripts ver mghcVer = do
   dir <- ghcupHLSDir ver
   let bdir = fromGHCupPath dir </> "bin"
   fmap (bdir </>) . filter (\f -> maybe True (\gv -> ("-" <> T.unpack (prettyVer gv)) `isSuffixOf` f) mghcVer)
-    <$> liftIO (listDirectory bdir)
+    <$> liftIO (listDirectoryFiles bdir)
 
 -- | Get all binaries for a hls version from the ~/.ghcup/hls/<ver>/lib/haskell-language-server-<ver>/bin directory, if any.
 -- Returns the full path.
@@ -639,7 +639,7 @@ hlsInternalServerBinaries ver mghcVer = do
   let regex = makeRegexOpts compExtended execBlank ([s|^haskell-language-server-.*$|] :: ByteString)
   (Just bdir) <- fmap headMay $ liftIO $ expandFilePath [Left (dir </> "lib"), Right regex, Left "bin"]
   fmap (bdir </>) . filter (\f -> maybe True (\gv -> ("-" <> T.unpack (prettyVer gv)) `isSuffixOf` f) mghcVer)
-    <$> liftIO (listDirectory bdir)
+    <$> liftIO (listDirectoryFiles bdir)
 
 -- | Get all libraries for a hls version from the ~/.ghcup/hls/<ver>/lib/haskell-language-server-<ver>/lib/<ghc-ver>/
 -- directory, if any.
@@ -652,7 +652,7 @@ hlsInternalServerLibs ver ghcVer = do
   dir <- fromGHCupPath <$> ghcupHLSDir ver
   let regex = makeRegexOpts compExtended execBlank ([s|^haskell-language-server-.*$|] :: ByteString)
   (Just bdir) <- fmap headMay $ liftIO $ expandFilePath [Left (dir </> "lib"), Right regex, Left ("lib" </> T.unpack (prettyVer ghcVer))]
-  fmap (bdir </>) <$> liftIO (listDirectory bdir)
+  fmap (bdir </>) <$> liftIO (listDirectoryFiles bdir)
 
 
 -- | Get the wrapper binary for an hls version, if any.
@@ -773,13 +773,16 @@ getGHCForPVP' pvpIn ghcs' mt = do
 -- Just (PVP {_pComponents = 8 :| [8,4]})
 getLatestToolFor :: MonadThrow m
                  => Tool
+                 -> Maybe Text
                  -> PVP
                  -> GHCupDownloads
-                 -> m (Maybe (PVP, VersionInfo))
-getLatestToolFor tool pvpIn dls = do
-  let ls = fromMaybe [] $ preview (ix tool % to Map.toDescList) dls
-  let ps = catMaybes $ fmap (\(v, vi) -> (,vi) <$> versionToPVP v) ls
-  pure . fmap (first fst) . headMay . filter (\((v, _), _) -> matchPVPrefix pvpIn v) $ ps
+                 -> m (Maybe (PVP, VersionInfo, Maybe Text))
+getLatestToolFor tool target pvpIn dls = do
+  let ls :: [(GHCTargetVersion, VersionInfo)]
+      ls = fromMaybe [] $ preview (ix tool % to Map.toDescList) dls
+  let ps :: [((PVP, Text), VersionInfo, Maybe Text)]
+      ps = catMaybes $ fmap (\(v, vi) -> (,vi, _tvTarget v) <$> versionToPVP (_tvVersion v)) ls
+  pure . fmap (\((pv', _), vi, mt) -> (pv', vi, mt)) . headMay . filter (\((v, _), _, t) -> matchPVPrefix pvpIn v && t == target) $ ps
 
 
 
@@ -884,20 +887,41 @@ intoSubdir bdir tardir = case tardir of
 -- | Get the tool version that has this tag. If multiple have it,
 -- picks the greatest version.
 getTagged :: Tag
-          -> Fold (Map.Map Version VersionInfo) (Version, VersionInfo)
+          -> Fold (Map.Map GHCTargetVersion VersionInfo) (GHCTargetVersion, VersionInfo)
 getTagged tag =
   to (Map.toDescList . Map.filter (\VersionInfo {..} -> tag `elem` _viTags))
   % folding id
 
-getLatest :: GHCupDownloads -> Tool -> Maybe (Version, VersionInfo)
+getByReleaseDay :: GHCupDownloads -> Tool -> Day -> Either (Maybe Day) (GHCTargetVersion, VersionInfo)
+getByReleaseDay av tool day = let mvv = fromMaybe mempty $ headOf (ix tool) av
+                                  mdv = Map.foldrWithKey (\k vi@VersionInfo{..} m ->
+                                            maybe m (\d -> let diff = diffDays d day
+                                                           in Map.insert (abs diff) (diff, (k, vi)) m) _viReleaseDay)
+                                          Map.empty mvv
+                              in case headMay (Map.toAscList mdv) of
+                                   Nothing -> Left Nothing
+                                   Just (absDiff, (diff, (k, vi)))
+                                     | absDiff == 0 -> Right (k, vi)
+                                     | otherwise -> Left (Just (addDays diff day))
+
+getByReleaseDayFold :: Day -> Fold (Map.Map GHCTargetVersion VersionInfo) (GHCTargetVersion, VersionInfo)
+getByReleaseDayFold day = to (Map.toDescList . Map.filter (\VersionInfo {..} -> Just day == _viReleaseDay)) % folding id
+
+getLatest :: GHCupDownloads -> Tool -> Maybe (GHCTargetVersion, VersionInfo)
 getLatest av tool = headOf (ix tool % getTagged Latest) av
 
-getRecommended :: GHCupDownloads -> Tool -> Maybe (Version, VersionInfo)
+getLatestPrerelease :: GHCupDownloads -> Tool -> Maybe (GHCTargetVersion, VersionInfo)
+getLatestPrerelease av tool = headOf (ix tool % getTagged LatestPrerelease) av
+
+getLatestNightly :: GHCupDownloads -> Tool -> Maybe (GHCTargetVersion, VersionInfo)
+getLatestNightly av tool = headOf (ix tool % getTagged LatestNightly) av
+
+getRecommended :: GHCupDownloads -> Tool -> Maybe (GHCTargetVersion, VersionInfo)
 getRecommended av tool = headOf (ix tool % getTagged Recommended) av
 
 
 -- | Gets the latest GHC with a given base version.
-getLatestBaseVersion :: GHCupDownloads -> PVP -> Maybe (Version, VersionInfo)
+getLatestBaseVersion :: GHCupDownloads -> PVP -> Maybe (GHCTargetVersion, VersionInfo)
 getLatestBaseVersion av pvpVer =
   headOf (ix GHC % getTagged (Base pvpVer)) av
 
@@ -933,7 +957,7 @@ ghcToolFiles ver = do
   whenM (fmap not $ ghcInstalled ver)
         (throwE (NotInstalled GHC ver))
 
-  files <- liftIO (listDirectory bindir >>= filterM (doesFileExist . (bindir </>)))
+  files <- liftIO (listDirectoryFiles bindir >>= filterM (doesFileExist . (bindir </>)))
   pure (getUniqueTools . groupToolFiles . fmap (dropSuffix exeExt) $ files)
 
  where
@@ -951,11 +975,6 @@ ghcToolFiles ver = do
   isNotAnyInfix xs t = foldr (\a b -> not (a `isInfixOf` t) && b) True xs
 
 
--- | This file, when residing in @~\/.ghcup\/ghc\/\<ver\>\/@ signals that
--- this GHC was built from source. It contains the build config.
-ghcUpSrcBuiltFile :: FilePath
-ghcUpSrcBuiltFile = ".ghcup_src_built"
-
 
 -- | Calls gmake if it exists in PATH, otherwise make.
 make :: ( MonadThrow m
@@ -1078,11 +1097,15 @@ darwinNotarization _ _ = pure $ Right ()
 
 
 
-getChangeLog :: GHCupDownloads -> Tool -> Either Version Tag -> Maybe URI
-getChangeLog dls tool (Left v') =
+getChangeLog :: GHCupDownloads -> Tool -> ToolVersion -> Maybe URI
+getChangeLog dls tool (GHCVersion v') =
   preview (ix tool % ix v' % viChangeLog % _Just) dls
-getChangeLog dls tool (Right tag) =
+getChangeLog dls tool (ToolVersion (mkTVer -> v')) =
+  preview (ix tool % ix v' % viChangeLog % _Just) dls
+getChangeLog dls tool (ToolTag tag) =
   preview (ix tool % pre (getTagged tag) % to snd % viChangeLog % _Just) dls
+getChangeLog dls tool (ToolDay day) =
+  preview (ix tool % pre (getByReleaseDayFold day) % to snd % viChangeLog % _Just) dls
 
 
 -- | Execute a build action while potentially cleaning up:
@@ -1166,7 +1189,7 @@ rmBDir dir = withRunInIO (\run -> run $
            $ rmPathForcibly dir)
 
 
-getVersionInfo :: Version
+getVersionInfo :: GHCTargetVersion
                -> Tool
                -> GHCupDownloads
                -> Maybe VersionInfo
@@ -1196,7 +1219,7 @@ ensureGlobalTools
       (GHCupInfo _ _ gTools) <- lift getGHCupInfo
       dirs <- lift getDirs
       shimDownload <- liftE $ lE @_ @'[NoDownload]
-        $ maybe (Left NoDownload) Right $ Map.lookup ShimGen gTools
+        $ maybe (Left (NoDownload' ShimGen)) Right $ Map.lookup ShimGen gTools
       let dl = downloadCached' shimDownload (Just "gs.exe") Nothing
       void $ (\DigestError{} -> do
           lift $ logWarn "Digest doesn't match, redownloading gs.exe..."

lib/GHCup/Utils/Dirs.hs

@@ -42,6 +42,9 @@ module GHCup.Utils.Dirs
   , removeDirectoryRecursive
   , removePathForcibly
 
+  , listDirectoryFiles
+  , listDirectoryDirs
+
   -- System.Directory re-exports
   , createDirectory
   , createDirectoryIfMissing
@@ -130,7 +133,7 @@ import           Data.Maybe
 import           Data.Versions
 import           GHC.IO.Exception               ( IOErrorType(NoSuchThing) )
 import           Haskus.Utils.Variant.Excepts
-import           Optics
+import           Optics hiding ( uncons )
 import           Safe
 import           System.Directory hiding ( removeDirectory
                                          , removeDirectoryRecursive
@@ -276,7 +279,7 @@ ghcupCacheDir
             Nothing -> do
               home <- liftIO getHomeDirectory
               pure (home </> ".cache")
-          pure (GHCupPath (bdir </> "ghcup"))
+          pure (GHCupPath (bdir </> "ghcup" </> "cache"))
         else ghcupBaseDir <&> (\(GHCupPath gp) -> GHCupPath (gp </> "cache"))
 
 
@@ -305,19 +308,7 @@ ghcupLogsDir
 -- If 'GHCUP_USE_XDG_DIRS' is set (to anything),
 -- then uses 'XDG_CACHE_HOME/ghcup/db as per xdg spec.
 ghcupDbDir :: IO GHCupPath
-ghcupDbDir
-  | isWindows = ghcupBaseDir <&> (\(GHCupPath gp) -> GHCupPath (gp </> "db"))
-  | otherwise = do
-      xdg <- useXDG
-      if xdg
-        then do
-          bdir <- lookupEnv "XDG_CACHE_HOME" >>= \case
-            Just r  -> pure r
-            Nothing -> do
-              home <- liftIO getHomeDirectory
-              pure (home </> ".cache")
-          pure (GHCupPath (bdir </> "ghcup" </> "db"))
-        else ghcupBaseDir <&> (\(GHCupPath gp) -> GHCupPath (gp </> "db"))
+ghcupDbDir = ghcupBaseDir <&> (\(GHCupPath gp) -> GHCupPath (gp </> "db"))
 
 
 -- | '~/.ghcup/trash'.
@@ -529,6 +520,29 @@ cleanupTrash = do
       ) $ liftIO $ removePathForcibly (recycleDir `appendGHCupPath` fp))
 
 
+-- | List *actual files* in a directory, ignoring empty files and a couple
+-- of blacklisted files, such as '.DS_Store' on mac.
+listDirectoryFiles :: FilePath -> IO [FilePath]
+listDirectoryFiles fp = do
+  listDirectory fp >>= filterM (doesFileExist . (fp </>)) <&> filter (\fp' -> not (isHidden fp') && not (isBlacklisted fp'))
+
+-- | List *actual directories* in a directory, ignoring empty directories and a couple
+-- of blacklisted files, such as '.DS_Store' on mac.
+listDirectoryDirs :: FilePath -> IO [FilePath]
+listDirectoryDirs fp = do
+  listDirectory fp >>= filterM (doesDirectoryExist . (fp </>)) <&> filter (\fp' -> not (isHidden fp') && not (isBlacklisted fp'))
+
+isHidden :: FilePath -> Bool
+isHidden fp'
+  | isWindows = False
+  | Just ('.', _) <- uncons fp' = True
+  | otherwise = False
+
+isBlacklisted :: FilePath -> Bool
+{- HLINT ignore "Use ==" -}
+isBlacklisted fp' = fp' `elem` [".DS_Store"]
+
+
 
 -- System.Directory re-exports with GHCupPath
 

lib/GHCup/Version.hs

@@ -52,7 +52,7 @@ versionCmp ver1 (VR_lteq ver2) = ver1 <= ver2
 versionCmp ver1 (VR_eq ver2)   = ver1 == ver2
 
 versionRange :: V.Versioning -> VersionRange -> Bool
-versionRange ver' (SimpleRange cmps) = and $ fmap (versionCmp ver') cmps
+versionRange ver' (SimpleRange cmps) = all (versionCmp ver') cmps
 versionRange ver' (OrRange cmps range) = 
   versionRange ver' (SimpleRange cmps) || versionRange ver' range
 

mkdocs.yml

@@ -2,7 +2,6 @@ site_name: GHCup
 site_url: https://www.haskell.org/ghcup
 site_description: GHCup is the main installer for the general purpose language Haskell.
 site_author: GHCup Team
-site_favicon: haskell_logo.png
 
 repo_url: https://github.com/haskell/ghcup-hs
 

scripts/bootstrap/bootstrap-haskell

@@ -28,7 +28,7 @@
 
 plat="$(uname -s)"
 arch=$(uname -m)
-ghver="0.1.18.0"
+ghver="0.1.19.4"
 : "${GHCUP_BASE_URL:=https://downloads.haskell.org/~ghcup}"
 
 export GHCUP_SKIP_UPDATE_CHECK=yes
@@ -119,20 +119,26 @@ edo() {
     "$@" || die "\"$*\" failed!"
 }
 
+eghcup_raw() {
+	"${GHCUP_BIN}/ghcup" "$@" || die "\"ghcup $*\" failed!"
+}
+
 eghcup() {
-	edo _eghcup "$@"
+	_eghcup "$@"
 }
 
 _eghcup() {
 	if [ -n "${BOOTSTRAP_HASKELL_YAML}" ] ; then
-		args="-s ${BOOTSTRAP_HASKELL_YAML}"
+		args="-s ${BOOTSTRAP_HASKELL_YAML} --metadata-fetching-mode=Strict"
+    else
+		args="--metadata-fetching-mode=Strict"
 	fi
     if [ -z "${BOOTSTRAP_HASKELL_VERBOSE}" ] ; then
         # shellcheck disable=SC2086
-        "${GHCUP_BIN}/ghcup" ${args} "$@"
+        "${GHCUP_BIN}/ghcup" ${args} "$@" || die "\"ghcup ${args} $*\" failed!"
     else
         # shellcheck disable=SC2086
-        "${GHCUP_BIN}/ghcup" ${args} --verbose "$@"
+        "${GHCUP_BIN}/ghcup" ${args} --verbose "$@" || die "\"ghcup ${args} --verbose $*\" failed!"
     fi
 }
 
@@ -147,7 +153,7 @@ _ecabal() {
 }
 
 ecabal() {
-	edo _ecabal "$@"
+	_ecabal "$@" || die "\"cabal $*\" failed!"
 }
 
 _done() {
@@ -282,14 +288,6 @@ download_ghcup() {
 			esac
 			;;
         "FreeBSD"|"freebsd")
-            if freebsd-version | grep -E '^12.*' ; then
-                freebsd_ver=12
-            elif freebsd-version | grep -E '^13.*' ; then
-                freebsd_ver=13
-            else
-                die "Unsupported FreeBSD version! Please report a bug at https://github.com/haskell/ghcup-hs/issues"
-            fi
-
 			case "${arch}" in
 				x86_64|amd64)
 					;;
@@ -299,7 +297,7 @@ download_ghcup() {
 				*) die "Unknown architecture: ${arch}"
 					;;
 			esac
-			_url=${GHCUP_BASE_URL}/${ghver}/x86_64-freebsd${freebsd_ver}-ghcup-${ghver}
+			_url=${GHCUP_BASE_URL}/${ghver}/x86_64-portbld-freebsd-ghcup-${ghver}
             ;;
         "Darwin"|"darwin")
 			case "${arch}" in
@@ -387,10 +385,10 @@ download_ghcup() {
     edo . "${GHCUP_DIR}"/env
     case "${BOOTSTRAP_HASKELL_DOWNLOADER}" in
         "curl")
-            eghcup config set downloader Curl
+            eghcup_raw config set downloader Curl
             ;;
         "wget")
-            eghcup config set downloader Wget
+            eghcup_raw config set downloader Wget
             ;;
         *)
             die "Unknown downloader: ${BOOTSTRAP_HASKELL_DOWNLOADER}"
@@ -795,7 +793,7 @@ edo mkdir -p "${GHCUP_BIN}"
 
 if command -V "ghcup" >/dev/null 2>&1 ; then
     if [ -z "${BOOTSTRAP_HASKELL_NO_UPGRADE}" ] ; then
-        _eghcup upgrade || download_ghcup
+        ( _eghcup upgrade ) || download_ghcup
     fi
 else
 	download_ghcup
@@ -842,19 +840,19 @@ fi
 
 case $ask_hls_answer in
 	1)
-		_eghcup --cache install hls || warn "HLS installation failed, continuing anyway"
+        (_eghcup --cache install hls) || warn "HLS installation failed, continuing anyway"
 		;;
 	*) ;;
 esac
 
 case $ask_stack_answer in
 	1)
-		_eghcup --cache install stack || die "Stack installation failed"
+        (_eghcup --cache install stack) || die "Stack installation failed"
 		;;
 	2)
-		_eghcup --cache install stack || die "Stack installation failed"
-        edo mkdir -p "${STACK_ROOOT:-$HOME/.stack}"/hooks
-        hook_exe="${STACK_ROOOT:-$HOME/.stack}"/hooks/ghc-install.sh
+        (_eghcup --cache install stack) || die "Stack installation failed"
+        edo mkdir -p "${STACK_ROOT:-$HOME/.stack}"/hooks
+        hook_exe="${STACK_ROOT:-$HOME/.stack}"/hooks/ghc-install.sh
         hook_url="https://www.haskell.org/ghcup/sh/hooks/stack/ghc-install.sh"
 
         if [ -e "${hook_exe}" ] ; then

scripts/bootstrap/bootstrap-haskell.ps1

@@ -40,10 +40,13 @@ param (
     # Whether to disable use of curl.exe
     [switch]$DisableCurl,
     # The Msys2 version to download (e.g. 20221216)
-    [string]$Msys2Version
+    [string]$Msys2Version,
+    # The Msys2 sha256sum hash
+    [string]$Msys2Hash
 )
 
 $DefaultMsys2Version = "20221216"
+$DefaultMsys2Hash = "18370d32b0264915c97e3d7c618f7b32d48ad80858923883fde5145acd32ca0f"
 
 $Silent = !$Interactive
 
@@ -430,15 +433,24 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
 	if (!($Msys2Version)) {
 		$Msys2Version = $DefaultMsys2Version
 	}
+	if (!($Msys2Hash)) {
+		$Msys2Hash = $DefaultMsys2Hash
+	}
     Print-Msg -msg ('Downloading Msys2 archive {0}...' -f $Msys2Version)
     $archive = ('msys2-base-x86_64-{0}.sfx.exe' -f $Msys2Version)
+    $msysUrl = ('https://downloads.haskell.org/ghcup/msys2/{0}' -f "$archive")
     $archivePath = ('{0}\{1}' -f ([IO.Path]::GetTempPath()), "$archive")
 
     if ((Get-Command -Name 'curl.exe' -ErrorAction SilentlyContinue) -and !($DisableCurl)) {
-      Exec "curl.exe" '-o' "$archivePath" ('https://repo.msys2.org/distrib/x86_64/{0}' -f "$archive")
+      Exec "curl.exe" '-o' "$archivePath" "$msysUrl"
     } else {
-      Get-FileWCSynchronous -url ('https://repo.msys2.org/distrib/{0}' -f $archive) -destinationFolder ([IO.Path]::GetTempPath()) -includeStats
+      Get-FileWCSynchronous -url "$msysUrl" -destinationFolder ([IO.Path]::GetTempPath()) -includeStats
     }
+	$Msys2HashChecked = Get-FileHash -Algorithm SHA256 "${archivePath}"
+	if (!($Msys2HashChecked.Hash -eq $Msys2Hash)) {
+		Print-Msg -color Red -msg ("Hashes don't match, got {0}, but expected {1}" -f $Msys2HashChecked, $Msys2Hash)
+		Exit 1
+	}
 
     Print-Msg -msg 'Extracting Msys2 archive...'
     $null = & "$archivePath" '-y' ('-o{0}' -f $GhcupDir)  # Extract
@@ -447,7 +459,7 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
     Print-Msg -msg 'Processing MSYS2 bash for first time use...'
     Exec "$Bash" '-lc' 'exit'
 
-    Exec "$env:windir\system32\taskkill.exe" /F /FI `"MODULES eq msys-2.0.dll`"
+    Exec "$env:windir\system32\taskkill.exe" /F /FI "MODULES eq msys-2.0.dll"
 
     Print-Msg -msg 'Upgrading full system...'
     Exec "$Bash" '-lc' 'pacman --noconfirm -Syuu'

scripts/releasing/create-yaml-snippet.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+
+set -eu
+set -o pipefail
+
+RELEASE=$1
+
+get_sha() {
+    sha256sum "$1" | awk '{ print $1 }'
+}
+
+cd "gh-release-artifacts/v${RELEASE}"
+
+cat <<EOF > /dev/stdout
+  GHCup:
+    ${RELEASE}:
+      viTags:
+      - Recommended
+      - Latest
+      viChangeLog: https://github.com/haskell/ghcup-hs/blob/master/CHANGELOG.md
+      viSourceDL:
+        dlUri: https://downloads.haskell.org/~ghcup/${RELEASE}/ghcup-${RELEASE}-src.tar.gz
+        dlSubdir: ghcup-${RELEASE}
+        dlHash: $(get_sha "ghcup-${RELEASE}-src.tar.gz")
+      viArch:
+        A_64:
+          Linux_UnknownLinux:
+            unknown_versioning: &ghcup-64
+              dlUri: https://downloads.haskell.org/~ghcup/${RELEASE}/x86_64-linux-ghcup-${RELEASE}
+              dlHash: $(get_sha "x86_64-linux-ghcup-${RELEASE}")
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/${RELEASE}/x86_64-apple-darwin-ghcup-${RELEASE}
+              dlHash: $(get_sha "x86_64-apple-darwin-ghcup-${RELEASE}")
+          FreeBSD:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/${RELEASE}/x86_64-portbld-freebsd-ghcup-${RELEASE}
+              dlHash: $(get_sha "x86_64-portbld-freebsd-ghcup-${RELEASE}")
+          Windows:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/${RELEASE}/x86_64-mingw64-ghcup-${RELEASE}.exe
+              dlHash: $(get_sha "x86_64-mingw64-ghcup-${RELEASE}.exe")
+          Linux_Alpine:
+            unknown_versioning: *ghcup-64
+        A_32:
+          Linux_UnknownLinux:
+            unknown_versioning: &ghcup-32
+              dlUri: https://downloads.haskell.org/~ghcup/${RELEASE}/i386-linux-ghcup-${RELEASE}
+              dlHash: $(get_sha "i386-linux-ghcup-${RELEASE}")
+          Linux_Alpine:
+            unknown_versioning: *ghcup-32
+        A_ARM64:
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/${RELEASE}/aarch64-linux-ghcup-${RELEASE}
+              dlHash: $(get_sha "aarch64-linux-ghcup-${RELEASE}")
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/${RELEASE}/aarch64-apple-darwin-ghcup-${RELEASE}
+              dlHash: $(get_sha "aarch64-apple-darwin-ghcup-${RELEASE}")
+        A_ARM:
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/${RELEASE}/armv7-linux-ghcup-${RELEASE}
+              dlHash: $(get_sha "armv7-linux-ghcup-${RELEASE}")
+EOF
+

scripts/releasing/pull_release_artifacts.sh

@@ -1,49 +1,37 @@
+#!/bin/bash
 
 set -eu
+set -o pipefail
 
-tag=v$1
-ver=$1
+shopt -s extglob
 
-dest=$2
-gpg_user=$3
+RELEASE=$1
+SIGNER=$2
+TAG=${RELEASE/v/}
 
-mkdir -p "${dest}"
+echo "RELEASE: $RELEASE"
+echo "SIGNER: $SIGNER"
 
-cd "${dest}"
+for com in gh gpg curl sha256sum ; do
+	command -V ${com} >/dev/null 2>&1
+done
 
-base_url="https://gitlab.haskell.org/api/v4/projects/618/jobs/artifacts/${tag}/raw"
+[ ! -e "gh-release-artifacts/${RELEASE}" ]
 
-curl -f -o "x86_64-apple-darwin-ghcup-${ver}" \
-	"${base_url}/out/x86_64-apple-darwin-ghcup-${ver}?job=release:darwin"
+mkdir -p "gh-release-artifacts/${RELEASE}"
 
-curl -f -o "aarch64-apple-darwin-ghcup-${ver}" \
-	"${base_url}/out/aarch64-apple-darwin-ghcup-${ver}?job=release:darwin:aarch64"
+git archive --format=tar.gz -o "gh-release-artifacts/${RELEASE}/ghcup-${TAG}-src.tar.gz" --prefix="ghcup-${TAG}/" HEAD
 
-curl -f -o "x86_64-freebsd12-ghcup-${ver}" \
-	"${base_url}/out/x86_64-portbld-freebsd-ghcup-${ver}?job=release:freebsd12"
+cd "gh-release-artifacts/${RELEASE}"
 
-curl -f -o "x86_64-freebsd13-ghcup-${ver}" \
-	"${base_url}/out/x86_64-portbld-freebsd-ghcup-${ver}?job=release:freebsd13"
-
-curl -f -o "i386-linux-ghcup-${ver}" \
-	"${base_url}/out/i386-linux-ghcup-${ver}?job=release:linux:32bit"
-
-curl -f -o "x86_64-linux-ghcup-${ver}" \
-	"${base_url}/out/x86_64-linux-ghcup-${ver}?job=release:linux:64bit"
-
-curl -f -o "aarch64-linux-ghcup-${ver}" \
-	"${base_url}/out/aarch64-linux-ghcup-${ver}?job=release:linux:aarch64"
-
-curl -f -o "armv7-linux-ghcup-${ver}" \
-	"${base_url}/out/armv7-linux-ghcup-${ver}?job=release:linux:armv7"
-
-curl -f -o "x86_64-mingw64-ghcup-${ver}.exe" \
-	"${base_url}/out/x86_64-mingw64-ghcup-${ver}.exe?job=release:windows"
-
-rm -f *.sig
-sha256sum *-ghcup-* > SHA256SUMS
-gpg --detach-sign -u ${gpg_user} SHA256SUMS
-for f in *-ghcup-* ; do gpg --detach-sign -u ${gpg_user} $f ; done
+# github
+gh release download "$RELEASE"
 
+# cirrus
+curl -L -o "x86_64-portbld-freebsd-ghcup-${TAG}" \
+	"https://api.cirrus-ci.com/v1/artifact/github/haskell/ghcup-hs/build/binaries/out/x86_64-portbld-freebsd-ghcup-${TAG}?branch=${RELEASE}"
 
+sha256sum ./*-ghcup-* > SHA256SUMS
+gpg --detach-sign -u "${SIGNER}" SHA256SUMS
 
+gh release upload "$RELEASE" "ghcup-${TAG}-src.tar.gz" "x86_64-portbld-freebsd-ghcup-${TAG}" SHA256SUMS SHA256SUMS.sig

scripts/releasing/sftp-symlink-artifacts.sh

@@ -21,16 +21,14 @@ rm i386-linux-ghcup
 rm x86_64-apple-darwin-ghcup
 rm x86_64-linux-ghcup
 rm x86_64-mingw64-ghcup.exe
-rm x86_64-freebsd12-ghcup
-rm x86_64-freebsd13-ghcup
+rm x86_64-portbld-freebsd-ghcup
 
 symlink ${ver}/aarch64-apple-darwin-ghcup-${ver} aarch64-apple-darwin-ghcup
 symlink ${ver}/aarch64-linux-ghcup-${ver} aarch64-linux-ghcup
 symlink ${ver}/armv7-linux-ghcup-${ver} armv7-linux-ghcup
 symlink ${ver}/i386-linux-ghcup-${ver} i386-linux-ghcup
 symlink ${ver}/x86_64-apple-darwin-ghcup-${ver} x86_64-apple-darwin-ghcup
-symlink ${ver}/x86_64-freebsd12-ghcup-${ver} x86_64-freebsd12-ghcup
-symlink ${ver}/x86_64-freebsd13-ghcup-${ver} x86_64-freebsd13-ghcup
+symlink ${ver}/x86_64-portbld-freebsd-ghcup-${ver} x86_64-portbld-freebsd-ghcup
 symlink ${ver}/x86_64-linux-ghcup-${ver} x86_64-linux-ghcup
 symlink ${ver}/x86_64-mingw64-ghcup-${ver}.exe x86_64-mingw64-ghcup.exe
 EOF

scripts/releasing/sftp-upload-artifacts.sh

@@ -25,22 +25,28 @@ put SHA256SUMS
 put SHA256SUMS.sig
 put aarch64-apple-darwin-ghcup-${ver}
 put aarch64-apple-darwin-ghcup-${ver}.sig
+put aarch64-apple-darwin-ghcup.plan.json
 put aarch64-linux-ghcup-${ver}
 put aarch64-linux-ghcup-${ver}.sig
+put aarch64-linux-ghcup.plan.json
 put armv7-linux-ghcup-${ver}
 put armv7-linux-ghcup-${ver}.sig
+put armv7-linux-ghcup.plan.json
 put i386-linux-ghcup-${ver}
 put i386-linux-ghcup-${ver}.sig
+put i386-linux-ghcup.plan.json
 put x86_64-apple-darwin-ghcup-${ver}
 put x86_64-apple-darwin-ghcup-${ver}.sig
-put x86_64-freebsd12-ghcup-${ver}
-put x86_64-freebsd12-ghcup-${ver}.sig
-put x86_64-freebsd13-ghcup-${ver}
-put x86_64-freebsd13-ghcup-${ver}.sig
+put x86_64-apple-darwin-ghcup.plan.json
+put x86_64-portbld-freebsd-ghcup-${ver}
+put x86_64-portbld-freebsd-ghcup-${ver}.sig
+put x86_64-portbld-freebsd-ghcup.plan.json
 put x86_64-linux-ghcup-${ver}
 put x86_64-linux-ghcup-${ver}.sig
+put x86_64-linux-ghcup.plan.json
 put x86_64-mingw64-ghcup-${ver}.exe
 put x86_64-mingw64-ghcup-${ver}.exe.sig
+put x86_64-mingw64-ghcup.plan.json
 EOF
 
 curl -X PURGE https://downloads.haskell.org/~ghcup/${ver}/

stack.yaml

@@ -1,52 +1,36 @@
-resolver: lts-18.28
+resolver: lts-20.20
 
 packages:
   - .
 
 extra-deps:
-  - Cabal-3.6.2.0@sha256:e2266e14758c1f799220fad7f0d4b0b4ec567d81b7ba3faea17ff76d4c31de95,12437
-  - IfElse-0.85@sha256:6939b94acc6a55f545f63a168a349dd2fbe4b9a7cca73bf60282db5cc6aa47d2,445
-  - ascii-string-1.0.1.4@sha256:fa34f1d9ba57e8e89c0d4c9cef5e01ba32cb2d4373d13f92dcc0b531a6c6749b,2582
-  - base16-bytestring-0.1.1.7@sha256:0021256a9628971c08da95cb8f4d0d72192f3bb8a7b30b55c080562d17c43dd3,2231
-  - brick-0.64@sha256:f03fa14607c22cf48af99e24c44f79a0fb073f7ec229f15e969fed9ff73c93f6,16530
-  - brotli-0.0.0.0@sha256:2bf383a4cd308745740986be0b18381c5a0784393fe69b91456aacb2d603de46,2964
-  - brotli-streams-0.0.0.0@sha256:1af1e22f67b8bfd6ad0d05e61825e7a178d738f689ebbb21c1aab5f1bbcae176,2331
+  - Cabal-3.6.3.0
+  - Cabal-syntax-3.10.1.0
+  - aeson-2.1.2.1
+  - cabal-install-parsers-0.6.1
   - chs-cabal-0.1.1.1
-  - chs-deps-0.1.0.0@sha256:0cdada6d2c682c41b20331b8c63c2ecfc7e806928585195fd544c9d41f3074fd,2496
-  - composition-prelude-3.0.0.2@sha256:1ffed216bd28d810fce0b5be83a661e2a892696d73b3f8de5c0f5edb9b5f0090,1216
+  - chs-deps-0.1.0.0
+  - generic-arbitrary-0.2.2@sha256:202ffbf2032672a51318f2e80d7e75b72f8950e690346b4314f38bc7e39215f7,1189
+  - generically-0.1.1
   - haskus-utils-data-1.4@sha256:bfa94363b94b14779edd6834fbd59dbb847c3d7b8f48e3844f456ffdc077da4a,1466
   - haskus-utils-types-1.5.1@sha256:991c472f4e751e2f0d7aab6ad4220ef151d6160876dcf0511bbf876bbd432020,1298
-  - haskus-utils-variant-3.2.1@sha256:791f4cf1e786eb578f4d37aef60986641f84c36e130164321f7d01542584066a,2200
-  - heaps-0.3.6.1@sha256:7928b759ca5180d35722c45948c0bde264229f3c99c1888188a3d9285f13d3d2,1340
-  - hpath-filepath-0.10.4@sha256:e9e44fb5fdbade7f30b5b5451257dbee15b6ef1aae4060034d73008bb3b5d878,1269
-  - hpath-posix-0.13.3@sha256:abe472cf16bccd3a8b8814865ed3551a728fde0f3a2baea2acc03023bec6c565,1615
-  - hspec-2.7.10@sha256:c9e82c90086acebac576552a06f3cabd249bba048edd1667c7fae0b1313d5bce,1712
-  - hspec-core-2.7.10@sha256:2aba6ea126442b29e8183ab27f1c811706b19b1d83b02f193a896f6fc1589d13,4621
-  - hspec-discover-2.7.10@sha256:d08bf5dd785629f589571477d9beb7cd91529471bd89f39517c1cb4b9b38160f,2184
-  - hspec-golden-aeson-0.9.0.0@sha256:aa17274114026661ba4dfc9c60c230673c8f408bd86482fd611d2d5cb6aff996,2179
-  - http-io-streams-0.1.6.0@sha256:53f5bab177efb52cd65ec396fd04ed59b93e5f919fb3700cd7dacd6cfce6f06d,3582
-  - libarchive-3.0.3.0
+  - haskus-utils-variant-3.2.1
+  - libarchive-3.0.3.2
   - libyaml-streamly-0.2.1
-  - lzma-static-5.2.5.3@sha256:2758ee58c35992fcf7db78e98684c357a16a82fa2a4e7c352a6c210c08c555d8,7308
-  - optics-0.4@sha256:9fb69bf0195b8d8f1f8cd0098000946868b8a3c3ffb51e5b64f79fc600c3eb4c,6568
-  - optics-core-0.4@sha256:59e04aebca536bd011ae50c781937f45af4c1456af1eb9fb578f9a69eee293cd,4995
-  - optics-extra-0.4@sha256:b9914f38aa7d5c92f231060d9168447f9f5a367c07df9bf47a003e3e786d5e05,3432
-  - optics-th-0.4@sha256:7c838b5b1d6998133bf8f0641c36197ed6cb468dc69515e1952f33f0bbe8e11d,2009
-  - os-release-1.0.1@sha256:1281c62081f438fc3f0874d3bae6a4887d5964ac25261ba06e29d368ab173467,2716
-  - primitive-0.7.1.0@sha256:29de6bfd0cf8ba023ceb806203dfbec0e51e3524e75ffe41056f70b4229c6f0f,2728
-  - regex-posix-clib-2.7
+  - lzma-static-5.2.5.5
+  - os-release-1.0.2.1
+  - parsec-3.1.15.0
   - streamly-0.8.2@sha256:ec521b7c1c4db068501c35804af77f40b7d34232f5e29d9b99e722229040eb80,23500
-  - unicode-data-0.3.0@sha256:0545e079705a5381d0893f8fe8daaa08fc9174baeab269b9cf651817d8eadbc6,5123
-  - strict-base-0.4.0.0@sha256:2ff4e43cb95eedf2995558d7fc34d19362846413dd39e6aa6a5b3ea8228fef9f,1248
-  - xor-0.0.1.0@sha256:f8362b4a68562b9afbcd727ff64c1a303970df3a032e0033d2f4c094c3501df3,2243
-  - yaml-streamly-0.12.1
+  - strict-base-0.4.0.0
+  - text-2.0.2
+  - yaml-streamly-0.12.2
 
 flags:
   http-io-streams:
     brotli: false
 
   libarchive:
-    system-libarchive: false
+    system-libarchive: true
 
   regex-posix:
     _regex-posix-clib: true

test/ghcup-test/GHCup/ArbitraryTypes.hs

@@ -11,6 +11,7 @@ import           GHCup.Types
 import           Data.ByteString                ( ByteString )
 import           Data.Versions
 import           Data.List.NonEmpty
+import           Data.Time.Calendar             ( Day(..) )
 import           Test.QuickCheck
 import           Test.QuickCheck.Arbitrary.ADT  ( ToADTArbitrary )
 import           Test.QuickCheck.Arbitrary.Generic
@@ -76,6 +77,9 @@ instance Arbitrary Port where
   arbitrary = genericArbitrary
   shrink    = genericShrink
 
+instance Arbitrary Day where
+  arbitrary = ModifiedJulianDay . fromIntegral <$> (chooseAny :: Gen Int)
+
 instance Arbitrary (URIRef Absolute) where
   arbitrary =
     URI <$> arbitrary <*> pure Nothing <*> arbitrary <*> pure (Query []) <*> pure Nothing
@@ -179,6 +183,10 @@ instance Arbitrary GHCupInfo where
   arbitrary = genericArbitrary
   shrink    = genericShrink
 
+instance Arbitrary GHCTargetVersion where
+  arbitrary = GHCTargetVersion Nothing <$> arbitrary
+  shrink    = genericShrink
+
 
 -- our maps are nested... the default size easily blows up most ppls ram
 

test/ghcup-test/GHCup/Prelude/File/Posix/TraversalsSpec.hs

@@ -24,11 +24,11 @@ spec = do
   -- https://github.com/haskell/ghcup-hs/issues/415
   describe "GHCup.Prelude.File.Posix.Traversals" $ do
     it "readDirEnt" $ do
-      dirstream <- liftIO $ openDirStream "test/data"
-      (dt1, fp1) <- readDirEnt dirstream
-      (dt2, fp2) <- readDirEnt dirstream
-      (dt3, fp3) <- readDirEnt dirstream
-      (dt4, fp4) <- readDirEnt dirstream
+      dirstream <- liftIO $ openDirStreamPortable "test/ghcup-test/data"
+      (dt1, fp1) <- readDirEntPortable dirstream
+      (dt2, fp2) <- readDirEntPortable dirstream
+      (dt3, fp3) <- readDirEntPortable dirstream
+      (dt4, fp4) <- readDirEntPortable dirstream
       let xs = sortOn snd [ (dt1, fp1), (dt2, fp2)
                           , (dt3, fp3), (dt4, fp4)
                           ]

test/ghcup-test/GHCup/Types/JSONSpec.hs

@@ -17,6 +17,6 @@ spec = do
   roundtripAndGoldenSpecsWithSettings (defaultSettings { goldenDirectoryOption = CustomDirectoryName goldenDir }) (Proxy @GHCupInfo)
  where
   goldenDir
-    | isWindows = "test/golden/windows"
-    | otherwise = "test/golden/unix"
+    | isWindows = "test/ghcup-test/golden/windows"
+    | otherwise = "test/ghcup-test/golden/unix"
 

test/optparse-test/ChangeLogTest.hs

@@ -0,0 +1,49 @@
+module ChangeLogTest where
+
+import Test.Tasty
+import GHCup.OptParse
+import Utils
+import Test.Tasty.HUnit
+import Control.Monad.IO.Class
+import GHCup.Types
+import Data.Versions
+import Data.List.NonEmpty (NonEmpty ((:|)))
+
+changeLogTests :: TestTree
+changeLogTests = testGroup "changelog" $ map (uncurry check) checkList
+  where
+    check :: String -> ChangeLogOptions -> TestTree
+    check args expected = testCase args $ do
+      res <- changeLogParseWith (words args)
+      liftIO $ res @?= expected
+
+checkList :: [(String, ChangeLogOptions)]
+checkList =
+  [ ("changelog", ChangeLogOptions False Nothing Nothing)
+  , ("changelog -o", ChangeLogOptions True Nothing Nothing)
+  , ("changelog -t ghc", ChangeLogOptions False (Just GHC) Nothing)
+  , ("changelog -t cabal", ChangeLogOptions False (Just Cabal) Nothing)
+  , ("changelog -t hls", ChangeLogOptions False (Just HLS) Nothing)
+  , ("changelog -t stack", ChangeLogOptions False (Just Stack) Nothing)
+  , ("changelog -t ghcup", ChangeLogOptions False (Just GHCup) Nothing)
+  , ("changelog 9.2", ChangeLogOptions False Nothing
+      (Just $ GHCVersion
+        $ GHCTargetVersion
+          Nothing
+          (mkVersion $ (Digits 9 :| []) :| [Digits 2 :| []]))
+    )
+  , ("changelog recommended", ChangeLogOptions False Nothing (Just $ ToolTag Recommended))
+  , ("changelog -t cabal recommended", ChangeLogOptions False (Just Cabal) (Just $ ToolTag Recommended))
+  , ("changelog -t cabal 3.10.1.0", ChangeLogOptions False (Just Cabal)
+      (Just $ GHCVersion
+        $ GHCTargetVersion
+          Nothing
+          (mkVersion $ (Digits 3 :| []) :| [Digits 10 :| [],Digits 1 :| [],Digits 0 :| []]))
+    )
+  , ("changelog 2023-07-22", ChangeLogOptions False Nothing (Just (ToolDay (read "2023-07-22"))))
+  ]
+
+changeLogParseWith :: [String] -> IO ChangeLogOptions
+changeLogParseWith args = do
+  ChangeLog a <- parseWith args
+  pure a