Update .gitignore

.cirrus.yml

@@ -1,28 +0,0 @@
-freebsd_instance:
-  image_family: freebsd-13-2
-
-build_task:
-  name: build
-  env:
-    GHC_VER: 9.2.4
-    CABAL_VER: 3.8.1.0
-    ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-    ARCH: 64
-    RUNNER_OS: FreeBSD
-    DISTRO: na
-    GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
-    JSON_VERSION: "0.0.7"
-    CIRRUS_CLONE_SUBMODULES: true
-    AWS_ACCESS_KEY_ID: ENCRYPTED[6ed6287e2dd78ab5f84b22232c5245834ab042bd8ba443883aaf4b4d1ecc0481add1fdfad5ae6f6a8cfb418e6f19b2fc]
-    AWS_SECRET_ACCESS_KEY: ENCRYPTED[16f3cda2954c7cee99444e6788eb5997382aa4ce1477e7523fef2586077541f43b5c816156961fc6b4677259679875a7]
-    S3_HOST: ENCRYPTED[ce961780a33159f7d1d8046956b5ac6ebc3bfc8149428e5f538576cda51d9f3d0c35b79cdd1e325793639ff6e31f889d]
-  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
-    - bash .github/scripts/build.sh
-    - bash .github/scripts/test.sh
-  binaries_artifacts:
-    path: "out/*"

.editorconfig

@@ -1,11 +0,0 @@
-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/ghcup-run.files

@@ -1,37 +0,0 @@
-.
-./cabal
-./ghc
-./ghc-8.10.7
-./ghc-pkg
-./ghc-pkg-8.10.7
-./ghci
-./ghci-8.10.7
-./haddock
-./haddock-8.10.7
-./haskell-language-server-8.10.6
-./haskell-language-server-8.10.6~1.6.1.0
-./haskell-language-server-8.10.7
-./haskell-language-server-8.10.7~1.6.1.0
-./haskell-language-server-8.6.5
-./haskell-language-server-8.6.5~1.6.1.0
-./haskell-language-server-8.8.4
-./haskell-language-server-8.8.4~1.6.1.0
-./haskell-language-server-9.0.1
-./haskell-language-server-9.0.1~1.6.1.0
-./haskell-language-server-9.0.2
-./haskell-language-server-9.0.2~1.6.1.0
-./haskell-language-server-9.2.1
-./haskell-language-server-9.2.1~1.6.1.0
-./haskell-language-server-wrapper
-./haskell-language-server-wrapper-1.6.1.0
-./hp2ps
-./hp2ps-8.10.7
-./hpc
-./hpc-8.10.7
-./hsc2hs
-./hsc2hs-8.10.7
-./runghc
-./runghc-8.10.7
-./runhaskell
-./runhaskell-8.10.7
-./stack

.github/ghcup-run.files.alpine

@@ -1,31 +0,0 @@
-.
-./cabal
-./ghc
-./ghc-8.10.7
-./ghc-pkg
-./ghc-pkg-8.10.7
-./ghci
-./ghci-8.10.7
-./haddock
-./haddock-8.10.7
-./haskell-language-server-8.10.7
-./haskell-language-server-8.10.7~1.6.1.0
-./haskell-language-server-8.8.4
-./haskell-language-server-8.8.4~1.6.1.0
-./haskell-language-server-9.0.2
-./haskell-language-server-9.0.2~1.6.1.0
-./haskell-language-server-9.2.1
-./haskell-language-server-9.2.1~1.6.1.0
-./haskell-language-server-wrapper
-./haskell-language-server-wrapper-1.6.1.0
-./hp2ps
-./hp2ps-8.10.7
-./hpc
-./hpc-8.10.7
-./hsc2hs
-./hsc2hs-8.10.7
-./runghc
-./runghc-8.10.7
-./runhaskell
-./runhaskell-8.10.7
-./stack

.github/ghcup-run.files.windows

@@ -1,81 +0,0 @@
-.
-./cabal.exe
-./cabal.shim
-./ghc-8.10.7.exe
-./ghc-8.10.7.shim
-./ghc-pkg-8.10.7.exe
-./ghc-pkg-8.10.7.shim
-./ghc-pkg.exe
-./ghc-pkg.shim
-./ghc.exe
-./ghc.shim
-./ghci-8.10.7.exe
-./ghci-8.10.7.shim
-./ghci.exe
-./ghci.shim
-./ghcii-8.10.7.sh-8.10.7.exe
-./ghcii-8.10.7.sh-8.10.7.shim
-./ghcii-8.10.7.sh.exe
-./ghcii-8.10.7.sh.shim
-./ghcii.sh-8.10.7.exe
-./ghcii.sh-8.10.7.shim
-./ghcii.sh.exe
-./ghcii.sh.shim
-./haddock-8.10.7.exe
-./haddock-8.10.7.shim
-./haddock.exe
-./haddock.shim
-./haskell-language-server-8.10.6.exe
-./haskell-language-server-8.10.6.shim
-./haskell-language-server-8.10.6~1.6.1.0.exe
-./haskell-language-server-8.10.6~1.6.1.0.shim
-./haskell-language-server-8.10.7.exe
-./haskell-language-server-8.10.7.shim
-./haskell-language-server-8.10.7~1.6.1.0.exe
-./haskell-language-server-8.10.7~1.6.1.0.shim
-./haskell-language-server-8.6.5.exe
-./haskell-language-server-8.6.5.shim
-./haskell-language-server-8.6.5~1.6.1.0.exe
-./haskell-language-server-8.6.5~1.6.1.0.shim
-./haskell-language-server-8.8.4.exe
-./haskell-language-server-8.8.4.shim
-./haskell-language-server-8.8.4~1.6.1.0.exe
-./haskell-language-server-8.8.4~1.6.1.0.shim
-./haskell-language-server-9.0.1.exe
-./haskell-language-server-9.0.1.shim
-./haskell-language-server-9.0.1~1.6.1.0.exe
-./haskell-language-server-9.0.1~1.6.1.0.shim
-./haskell-language-server-9.0.2.exe
-./haskell-language-server-9.0.2.shim
-./haskell-language-server-9.0.2~1.6.1.0.exe
-./haskell-language-server-9.0.2~1.6.1.0.shim
-./haskell-language-server-9.2.1.exe
-./haskell-language-server-9.2.1.shim
-./haskell-language-server-9.2.1~1.6.1.0.exe
-./haskell-language-server-9.2.1~1.6.1.0.shim
-./haskell-language-server-wrapper-1.6.1.0.exe
-./haskell-language-server-wrapper-1.6.1.0.shim
-./haskell-language-server-wrapper.exe
-./haskell-language-server-wrapper.shim
-./hp2ps-8.10.7.exe
-./hp2ps-8.10.7.shim
-./hp2ps.exe
-./hp2ps.shim
-./hpc-8.10.7.exe
-./hpc-8.10.7.shim
-./hpc.exe
-./hpc.shim
-./hsc2hs-8.10.7.exe
-./hsc2hs-8.10.7.shim
-./hsc2hs.exe
-./hsc2hs.shim
-./runghc-8.10.7.exe
-./runghc-8.10.7.shim
-./runghc.exe
-./runghc.shim
-./runhaskell-8.10.7.exe
-./runhaskell-8.10.7.shim
-./runhaskell.exe
-./runhaskell.shim
-./stack.exe
-./stack.shim

.github/scripts/bootstrap.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -eux
-
-. .github/scripts/env.sh
-
-mkdir -p "$CI_PROJECT_DIR"/.local/bin
-
-git describe --always
-
-### build
-
-./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

@@ -1,27 +0,0 @@
-#!/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

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -eux
-
-. .github/scripts/common.sh
-
-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
-build_with_cache --project-file=cabal.project.release -w "${GHC}" --enable-tests
-
-# set up artifacts
-mkdir -p out
-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}${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

@@ -1,13 +0,0 @@
-#!/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,174 +0,0 @@
-#!/bin/sh
-
-. .github/scripts/env.sh
-
-ecabal() {
-	cabal "$@"
-}
-
-nonfatal() {
-	"$@" || "$* failed"
-}
-
-sync_from() {
-	if [ "${RUNNER_OS}" != "Windows" ] ; then
-		cabal_store_path="$(dirname "$(cabal help user-config | tail -n 1 | xargs)")/store"
-	fi
-
-	cabal-cache.sh sync-from-archive \
-		--host-name-override=${S3_HOST} \
-		--host-port-override=443 \
-		--host-ssl-override=True \
-		--region us-west-2 \
-		$([ "${RUNNER_OS}" != "Windows" ] && echo --store-path="$cabal_store_path") \
-		--archive-uri "s3://ghcup-hs/${RUNNER_OS}-${ARCH}-${DISTRO}"
-}
-
-sync_to() {
-	if [ "${RUNNER_OS}" != "Windows" ] ; then
-		cabal_store_path="$(dirname "$(cabal help user-config | tail -n 1 | xargs)")/store"
-	fi
-
-	cabal-cache.sh sync-to-archive \
-		--host-name-override=${S3_HOST} \
-		--host-port-override=443 \
-		--host-ssl-override=True \
-		--region us-west-2 \
-		$([ "${RUNNER_OS}" != "Windows" ] && echo --store-path="$cabal_store_path") \
-		--archive-uri "s3://ghcup-hs/${RUNNER_OS}-${ARCH}-${DISTRO}"
-}
-
-raw_eghcup() {
-	"$GHCUP_BIN/ghcup${ext}" -v -c "$@"
-}
-
-eghcup() {
-	if [ "${OS}" = "Windows" ] ; then
-		"$GHCUP_BIN/ghcup${ext}" -c -s "file:/$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml" "$@"
-	else
-		"$GHCUP_BIN/ghcup${ext}" -c -s "file://$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml" "$@"
-	fi
-}
-
-sha_sum() {
-	if [ "${OS}" = "FreeBSD" ] ; then
-		sha256 "$@"
-	else
-		sha256sum "$@"
-	fi
-
-}
-
-git_describe() {
-	git config --global --get-all safe.directory | grep '^\*$' || git config --global --add safe.directory "*"
-	git describe --always
-}
-
-download_cabal_cache() {
-	(
-	set -e
-	mkdir -p "$HOME/.local/bin"
-	dest="$HOME/.local/bin/cabal-cache"
-    url=""
-	exe=""
-	cd /tmp
-	case "${RUNNER_OS}" in
-		"Linux")
-			case "${ARCH}" in
-				"32") url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/experimental5/i386-linux-cabal-cache
-					;;
-				"64") url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/experimental5/x86_64-linux-cabal-cache
-					;;
-				"ARM64") url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/experimental5/aarch64-linux-cabal-cache
-					;;
-				"ARM") url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/experimental5/armv7-linux-cabal-cache
-					;;
-			esac
-			;;
-		"FreeBSD")
-			url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/experimental5/x86_64-portbld-freebsd-cabal-cache
-			;;
-		"Windows")
-			exe=".exe"
-			url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/experimental5/x86_64-mingw64-cabal-cache
-			;;
-		"macOS")
-			case "${ARCH}" in
-				"ARM64") url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/experimental5/aarch64-apple-darwin-cabal-cache
-					;;
-				"64") url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/experimental5/x86_64-apple-darwin-cabal-cache
-					;;
-			esac
-			;;
-	esac
-
-	if [ -n "${url}" ] ; then
-		case "${url##*.}" in
-			"gz")
-				curl -L -o - "${url}" | gunzip > cabal-cache${exe}
-				;;
-			*)
-				curl -o cabal-cache${exe} -L "${url}"
-				;;
-		esac
-		sha_sum cabal-cache${exe}
-		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
-	ecabal build --dependencies-only "$@" || sync_to
-	sync_to
-	ecabal build "$@"
-	sync_to
-}
-
-install_ghcup() {
-	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
-}
-
-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() {
-	(
-	set -e
-	local binary=$1
-	case "$(uname -s)" in
-		"Darwin"|"darwin")
-			;;
-		MSYS_*|MINGW*)
-			;;
-		*)
-			strip -s "${binary}"
-		   ;;
-   esac
-	)
-}

.github/scripts/cross.sh

@@ -1,74 +0,0 @@
-#!/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

@@ -1,30 +0,0 @@
-#!/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

@@ -1,72 +0,0 @@
-#!/usr/bin/env bash
-
-set -eux
-
-. .github/scripts/common.sh
-
-mkdir -p "$CI_PROJECT_DIR"/.local/bin
-
-### build
-
-
-
-if [ "${OS}" = "Windows" ] ; then
-	GHCUP_DIR="${GHCUP_INSTALL_BASE_PREFIX}"/ghcup
-else
-	GHCUP_DIR="${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup
-fi
-
-rm -rf "${GHCUP_DIR}"
-mkdir -p "${GHCUP_BIN}"
-
-ls -lah out
-find out
-cp "out/${ARTIFACT}"-* "$GHCUP_BIN/ghcup${ext}"
-chmod +x "$GHCUP_BIN/ghcup${ext}"
-echo "$PATH"
-
-"$GHCUP_BIN/ghcup${ext}" --version
-eghcup --version
-sha_sum "$GHCUP_BIN/ghcup${ext}"
-sha_sum "$(raw_eghcup --offline whereis ghcup)"
-
-git_describe
-
-eghcup install ghc "${GHC_VERSION}"
-eghcup install cabal "${CABAL_VERSION}"
-
-ecabal update
-
-if ! command -v cabal-cache ; then
-	download_cabal_cache "$HOME/.local/bin/cabal-cache"
-fi
-
-if ! cabal-cache version ; then
-	build_cabal_cache "$HOME/.local/bin"
-fi
-
-
-eghcup debug-info
-
-(
-	cd /tmp
-	git clone --depth 1 --branch "${HLS_TARGET_VERSION}" \
-		https://github.com/haskell/haskell-language-server.git \
-		"haskell-language-server-${HLS_TARGET_VERSION}"
-	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
-	ecabal build --dependencies-only -w "ghc-${GHC_VERSION}" --disable-profiling --disable-tests --jobs="$(nproc)" || sync_to
-	sync_to
-)
-
-eghcup -v compile hls -j "$(nproc)" -g "${HLS_TARGET_VERSION}" --ghc "${GHC_VERSION}"
-
-[ "$($(eghcup whereis hls "${HLS_TARGET_VERSION}") --numeric-version)" = "${HLS_TARGET_VERSION}" ] ||
-	[ "$($(eghcup whereis hls "${HLS_TARGET_VERSION}") --numeric-version | sed 's/.0$//')" = "${HLS_TARGET_VERSION}" ]
-
-# nuke
-eghcup nuke
-[ ! -e "${GHCUP_DIR}" ]
-

.github/scripts/test.sh

@@ -1,265 +0,0 @@
-#!/usr/bin/env bash
-
-set -eux
-
-. .github/scripts/common.sh
-
-
-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}"
-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
-sha_sum "$GHCUP_BIN/ghcup${ext}"
-sha_sum "$(raw_eghcup --offline whereis ghcup)"
-
-### Haskell test suite
-
-./"ghcup-test${ext}"
-./"ghcup-test-optparse${ext}"
-rm "ghcup-test${ext}" "ghcup-test-optparse${ext}"
-
-### manual cli based testing
-
-eghcup --numeric-version
-
-eghcup install ghc "${GHC_VER}"
-eghcup unset ghc "${GHC_VER}"
-ls -lah "$(eghcup whereis -d ghc "${GHC_VER}")"
-[ "$($(eghcup whereis ghc "${GHC_VER}") --numeric-version)" = "${GHC_VER}" ]
-[ "$(eghcup run -q --ghc "${GHC_VER}" -- ghc --numeric-version)" = "${GHC_VER}" ]
-[ "$(ghcup run -q --ghc "${GHC_VER}" -- ghc -e 'Control.Monad.join (Control.Monad.fmap System.IO.putStr System.Environment.getExecutablePath)')" = "$($(ghcup whereis ghc "${GHC_VER}") -e 'Control.Monad.join (Control.Monad.fmap System.IO.putStr System.Environment.getExecutablePath)')" ]
-eghcup set ghc "${GHC_VER}"
-eghcup install cabal "${CABAL_VER}"
-[ "$($(eghcup whereis cabal "${CABAL_VER}") --numeric-version)" = "${CABAL_VER}" ]
-eghcup unset cabal
-"$GHCUP_BIN"/cabal --version && exit 1 || echo yes
-
-# make sure no cabal is set when running 'ghcup run' to check that PATH propagages properly
-# https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/375
-[ "$(eghcup run -q --cabal "${CABAL_VER}" -- cabal --numeric-version)" = "${CABAL_VER}" ]
-eghcup set cabal "${CABAL_VER}"
-
-[ "$($(eghcup whereis cabal "${CABAL_VER}") --numeric-version)" = "${CABAL_VER}" ]
-
-if [ "${OS}" != "FreeBSD" ] ; then
-	if [ "${ARCH}" = "64" ] && [ "${DISTRO}" != "Alpine" ] ; then
-		eghcup run --ghc 8.10.7 --cabal 3.4.1.0 --hls 1.6.1.0 --stack 2.7.3 --install --bindir "$(pwd)/.bin"
-		if [ "${OS}" = "Windows" ] ; then
-			cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghcup-run.files.windows" | sort > expected.txt
-		elif [ "${DISTRO}" = "Alpine" ] ; then
-			cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghcup-run.files.alpine" | sort > expected.txt
-		else
-			cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghcup-run.files" | sort > expected.txt
-		fi
-		(cd ".bin" && find . | sort) > actual.txt
-		diff --strip-trailing-cr -w -u actual.txt expected.txt
-		rm actual.txt expected.txt
-		rm -rf .bin
-	fi
-fi
-
-cabal --version
-
-eghcup debug-info
-
-# also test etags
-eghcup list
-eghcup list -t ghc
-eghcup list -t cabal
-
-ghc_ver=$(ghc --numeric-version)
-ghc --version
-"ghc-${ghc_ver}" --version
-if [ "${OS}" != "Windows" ] ; then
-		ghci --version
-		"ghci-${ghc_ver}" --version
-fi
-
-
-if [ "${OS}" = "macOS" ] && [ "${ARCH}" = "ARM64" ] ; then
-	# missing bindists
-	echo
-elif [ "${OS}" = "FreeBSD" ] ; then
-	# not enough space
-	echo
-else
-	# test installing new ghc doesn't mess with currently set GHC
-	# https://gitlab.haskell.org/haskell/ghcup-hs/issues/7
-	if [ "${OS}" = "Linux" ] ; then
-		eghcup --downloader=wget prefetch ghc 8.10.3
-		eghcup --offline install ghc 8.10.3
-		if [ "${ARCH}" = "64" ] ; then
-		    if [ "${DISTRO}" = "Alpine" ] ; then
-				(cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghc-8.10.3-linux.alpine.files" | sort) > expected.txt
-			else
-				(cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghc-8.10.3-linux.files" | sort) > expected.txt
-			fi
-			(cd "${GHCUP_DIR}/ghc/8.10.3/" && find . | sort) > actual.txt
-			# ignore docs
-		    sed -i '/share\/doc/d' actual.txt
-		    sed -i '/share\/doc/d' expected.txt
-			diff --strip-trailing-cr -w -u actual.txt expected.txt
-			rm actual.txt expected.txt
-		fi
-	elif [ "${OS}" = "Windows" ] ; then
-		eghcup prefetch ghc 8.10.3
-		eghcup --offline install ghc 8.10.3
-		(cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghc-8.10.3-windows.files" | sort) > expected.txt
-		(cd "${GHCUP_DIR}/ghc/8.10.3/" && find . | sort) > actual.txt
-		diff --strip-trailing-cr -w -u actual.txt expected.txt
-		rm actual.txt expected.txt
-	else
-		eghcup prefetch ghc 8.10.3
-		eghcup --offline install ghc 8.10.3
-	fi
-	[ "$(ghc --numeric-version)" = "${ghc_ver}" ]
-	eghcup --offline set 8.10.3
-	eghcup set 8.10.3
-	[ "$(ghc --numeric-version)" = "8.10.3" ]
-	eghcup set "${GHC_VER}"
-	[ "$(ghc --numeric-version)" = "${ghc_ver}" ]
-	eghcup unset ghc
-    "$GHCUP_BIN"/ghc --numeric-version && exit 1 || echo yes
-	eghcup set "${GHC_VER}"
-	eghcup --offline rm 8.10.3
-	[ "$(ghc --numeric-version)" = "${ghc_ver}" ]
-
-
-	ls -lah "$GHCUP_BIN"
-
-	if [ "${OS}" = "macOS" ] ; then
-		eghcup install hls
-		$(eghcup whereis hls) --version
-
-		eghcup install stack
-		$(eghcup whereis stack) --version
-	elif [ "${OS}" = "Linux" ] ; then
-		if [ "${ARCH}" = "64" ] && [ "${DISTRO}" != "Alpine" ] ; then
-			eghcup install hls
-			haskell-language-server-wrapper --version
-			eghcup unset hls
-			"$GHCUP_BIN"/haskell-language-server-wrapper --version && exit 1 || echo yes
-
-			eghcup install stack
-			stack --version
-			eghcup unset stack
-			"$GHCUP_BIN"/stack --version && exit 1 || echo yes
-		fi
-	fi
-fi
-
-
-
-# check that lazy loading works for 'whereis'
-cp "$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml" "$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml.bak"
-echo '**' > "$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml"
-eghcup whereis ghc "$(ghc --numeric-version)"
-mv -f "$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml.bak" "$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml"
-
-eghcup rm "$(ghc --numeric-version)"
-
-# https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/116
-if [ "${OS}" = "Linux" ] ; then
-	if [ "${ARCH}" = "64" ] ; then
-		eghcup install cabal -u https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.7.0.0-pre20220407/cabal-install-3.7-x86_64-linux-alpine.tar.xz 3.4.0.0-rc4
-		eghcup rm cabal 3.4.0.0-rc4
-	fi
-fi
-
-eghcup gc -c
-
-# test etags
-rm -f "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml"
-raw_eghcup -s "https://www.haskell.org/ghcup/data/ghcup-${JSON_VERSION}.yaml" list
-# snapshot yaml and etags file
-etag=$(cat "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml.etags")
-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://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")
-# compare
-[ "${etag}" != "${etag2}" ]
-[ "${sha}" != "${sha2}" ]
-# 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://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}" ]
-[ "${sha2}" = "${sha3}" ]
-
-# test isolated installs
-if [ "${DISTRO}" != "Alpine" ] ; then
-	eghcup install ghc -i "$(pwd)/isolated" 8.10.5
-	[ "$(isolated/bin/ghc --numeric-version)" = "8.10.5" ]
-	! eghcup install ghc -i "$(pwd)/isolated" 8.10.5
-	if [ "${ARCH}" = "64" ] ; then
-		if [ "${OS}" = "Linux" ] || [ "${OS}" = "Windows" ] ; then
-			eghcup install cabal -i "$(pwd)/isolated" 3.4.0.0
-			[ "$(isolated/cabal --numeric-version)" = "3.4.0.0" ]
-			eghcup install stack -i "$(pwd)/isolated" 2.7.3
-			[ "$(isolated/stack --numeric-version)" = "2.7.3" ]
-			eghcup install hls -i "$(pwd)/isolated" 1.3.0
-			[ "$(isolated/haskell-language-server-wrapper --numeric-version)" = "1.3.0" ] ||
-				[ "$(isolated/haskell-language-server-wrapper --numeric-version)" = "1.3.0.0" ]
-
-			# test that isolated installs don't clean up target directory
-			cat <<EOF > "${GHCUP_BIN}/gmake"
-#!/bin/bash
-exit 1
-EOF
-			chmod +x "${GHCUP_BIN}/gmake"
-			mkdir isolated_tainted/
-			touch isolated_tainted/lol
-
-			! eghcup install ghc -i "$(pwd)/isolated_tainted" 8.10.5 --force
-			[ -e "$(pwd)/isolated_tainted/lol" ]
-			rm "${GHCUP_BIN}/gmake"
-		fi
-	fi
-fi
-
-eghcup upgrade
-eghcup upgrade -f
-
-# restore old ghcup, because we want to test nuke
-cp "out/${ARTIFACT}"-* "$GHCUP_BIN/ghcup${ext}"
-chmod +x "$GHCUP_BIN/ghcup${ext}"
-
-# 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/workflows/bootstrap.yaml

@@ -1,58 +0,0 @@
-name: Bootstrap tests
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - 'v*'
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  bootstrap:
-    name: bootstrap
-    runs-on: ${{ matrix.os }}
-    env:
-      BOOTSTRAP_HASKELL_CABAL_VERSION: 3.6.2.0
-      BOOTSTRAP_HASKELL_GHC_VERSION: 8.10.7
-      BOOTSTRAP_HASKELL_NONINTERACTIVE: yes
-      ARCH: 64
-      JSON_VERSION: "0.0.7"
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            DISTRO: Ubuntu
-          - os: macOS-11
-            DISTRO: na
-          - os: windows-latest
-            DISTRO: na
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-
-      - 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:
-          DISTRO: ${{ matrix.DISTRO }}
-
-      - if: runner.os == 'Windows'
-        name: Run bootstrap
-        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/cache.yaml

@@ -1,37 +0,0 @@
-name: Cache eviction
-
-on:
-  workflow_dispatch:
-    inputs:
-      key:
-        description: Which cache to evict
-        required: true
-        default: '/'
-        type: choice
-        options:
-        - FreeBSD-64-na
-        - Linux-32-Alpine
-        - Linux-64-Alpine
-        - Linux-64-Ubuntu
-        - Linux-ARM-Ubuntu
-        - Linux-ARM64-Ubuntu
-        - Windows-64-na
-        - macOS-64-na
-        - macOS-ARM64-na
-        - /
-jobs:
-  evict:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Remove from S3
-      uses: vitorsgomes/s3-rm-action@master
-      with:
-        args: --recursive
-      env:
-        AWS_S3_ENDPOINT: https://${{ secrets.S3_HOST }}
-        AWS_S3_BUCKET: ghcup-hs
-        AWS_REGION: us-west-2
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        PATH_TO_DELETE: ${{ github.event.inputs.key }}

.github/workflows/cross.yaml

@@ -1,140 +0,0 @@
-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

@@ -1,125 +0,0 @@
-name: Docker image builds
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * *'
-
-jobs:
-  docker-alpine32:
-    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 32bit)
-        uses: docker/build-push-action@v3
-        with:
-          context: ./docker/alpine32
-          push: true
-          tags: hasufell/i386-alpine-haskell:3.12
-          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:
-          context: ./docker/alpine64
-          push: true
-          tags: hasufell/alpine-haskell:3.12
-          platforms: linux/amd64
-
-  docker-arm32:
-    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/arm32v7/buster
-          push: true
-          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/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/hlint.yaml

@@ -1,26 +0,0 @@
-name: Hlint
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - 'v*'
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  hlint:
-    name: hlint
-    runs-on: ubuntu-latest
-    env:
-      JSON_VERSION: "0.0.7"
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-
-      - name: Run hlint
-        run: curl -sSL https://raw.github.com/ndmitchell/hlint/master/misc/run.sh | sh -s -- -r lib/ test/

.github/workflows/mkdocs.yaml

@@ -1,33 +0,0 @@
-name: MkDocs
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - 'v*'
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  mkdocs:
-    name: mkdocs
-    runs-on: ubuntu-latest
-    env:
-      JSON_VERSION: "0.0.7"
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-
-      - name: Install mkdocs deps
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y python3-pip
-          sudo pip3 install mkdocs
-
-      - name: Run mkdocs
-        run: |
-          mkdocs build

.github/workflows/release.yaml

@@ -1,518 +1,109 @@
-name: Build and release
+name: Create Release
 
 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-linux:
-    name: Build linux binary
+  draft_release:
+    name: Draft Release
+    runs-on: ubuntu-latest
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+
+    steps:
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          body: |
+            Changes in this Release
+            - First Change
+            - Second Change
+          draft: true
+          prerelease: false
+
+  release-mac:
+    name: Create Release
+    needs: draft_release
     runs-on: ${{ matrix.os }}
     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 }}
+      MACOSX_DEPLOYMENT_TARGET: 10.13
     strategy:
-      fail-fast: true
       matrix:
-        include:
-          - os: ubuntu-latest
-            ARTIFACT: "i386-linux-ghcup"
-            GHC_VER: 8.10.7
-            ARCH: 32
-          - os: ubuntu-latest
-            ARTIFACT: "x86_64-linux-ghcup"
-            GHC_VER: 8.10.7
-            ARCH: 64
+        os:
+          - macOS-10.15
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
+
+      - uses: haskell/actions/setup@v1.2
         with:
-          submodules: 'true'
+          ghc-version: 8.10.4
+          cabal-version: 3.4.0.0
 
-      - if: matrix.ARCH == '32'
-        name: Run build (32 bit linux)
-        uses: docker://hasufell/i386-alpine-haskell:3.12
-        with:
-          args: sh .github/scripts/build.sh
-        env:
-          ARTIFACT: ${{ matrix.ARTIFACT }}
-          ARCH: ${{ matrix.ARCH }}
-          GHC_VER: ${{ matrix.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: matrix.ARCH == '64'
-        name: Run build (64 bit linux)
-        uses: docker://hasufell/alpine-haskell:3.12
-        with:
-          args: sh .github/scripts/build.sh
-        env:
-          ARTIFACT: ${{ matrix.ARTIFACT }}
-          ARCH: ${{ matrix.ARCH }}
-          GHC_VER: ${{ matrix.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/*
-
-
-  build-arm:
-    name: Build ARM binary
-    runs-on: ${{ matrix.os }}
-    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 }}
-    strategy:
-      fail-fast: true
-      matrix:
-        include:
-          - os: [self-hosted, Linux, ARM64]
-            ARTIFACT: "armv7-linux-ghcup"
-            GHC_VER: 9.2.2
-            ARCH: ARM
-          - os: [self-hosted, Linux, ARM64]
-            ARTIFACT: "aarch64-linux-ghcup"
-            GHC_VER: 9.2.6
-            ARCH: ARM64
-    steps:
-      - uses: docker://arm64v8/debian:10
-        name: Cleanup (aarch64 linux)
-        with:
-          args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
-
-      - name: git config
-        run: |
-          git config --global --get-all safe.directory | grep '^\*$' || git config --global --add safe.directory "*"
+      - name: create ~/.local/bin
+        run: mkdir -p "$HOME/.local/bin"
         shell: bash
 
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
+      - name: Add ~/.local/bin to PATH
+        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
+        shell: bash
 
-      - if: matrix.ARCH == 'ARM'
-        uses: docker://hasufell/arm32v7-debian-haskell:10
-        name: Run build (armv7 linux)
-        with:
-          args: sh .github/scripts/build.sh
-        env:
-          ARTIFACT: ${{ matrix.ARTIFACT }}
-          ARCH: ${{ matrix.ARCH }}
-          GHC_VER: ${{ matrix.GHC_VER }}
-          DISTRO: Ubuntu
-          AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
-          AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
-          S3_HOST: ${{ env.S3_HOST }}
+      - name: Update cabal cache
+        run: cabal update
+        shell: bash
 
-      - if: matrix.ARCH == 'ARM64'
-        uses: docker://hasufell/arm64v8-debian-haskell:10
-        name: Run build (aarch64 linux)
-        with:
-          args: sh .github/scripts/build.sh
+      - name: Install cabal dependencies
+        run: cabal build --only-dependencies --constraint="zlib +bundled-c-zlib" --constraint="lzma +static" -ftui
+        shell: bash
+
+      - name: Build
+        run: cabal build --constraint="zlib +bundled-c-zlib" --constraint="lzma +static" -ftui
+        shell: bash
+
+      - name: Install
+        run: cp "$(cabal list-bin exe:ghcup)" ~/.local/bin/ghcup
+        shell: bash
+
+      - name: Strip
+        run: strip ~/.local/bin/ghcup
+        shell: bash
+
+      - name: Run tests
+        run: cabal test --constraint="zlib +bundled-c-zlib" --constraint="lzma +static" all
+        shell: bash
+
+      - name: Install git
+        run: brew install git
+
+      - name: set HOME
+        run: echo "HOME=$HOME" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Set ASSET_PATH
+        run: echo "ASSET_PATH=$HOME/.local/bin/ghcup" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Upload Release Asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
         env:
-          ARTIFACT: ${{ matrix.ARTIFACT }}
-          ARCH: ${{ matrix.ARCH }}
-          GHC_VER: ${{ matrix.GHC_VER }}
-          DISTRO: Ubuntu
-          AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
-          AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
-          S3_HOST: ${{ env.S3_HOST }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.draft_release.outputs.upload_url }}
+          asset_path: ${{ env.ASSET_PATH }}
+          asset_name: ghcup-${{ matrix.os }}
+          asset_content_type: application/octet-stream
 
       - if: always()
-        name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
-          name: artifacts
-          path: |
-            ./out/*
+          name: plan.json
+          path: ./dist-newstyle/cache/plan.json
 
-  build-macwin:
-    name: Build binary (Mac/Win)
-    runs-on: ${{ matrix.os }}
-    env:
-      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 }}
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      S3_HOST: ${{ secrets.S3_HOST }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: [self-hosted, macOS, ARM64]
-            ARTIFACT: "aarch64-apple-darwin-ghcup"
-            GHC_VER: 9.2.6
-            ARCH: ARM64
-          - os: macOS-11
-            ARTIFACT: "x86_64-apple-darwin-ghcup"
-            GHC_VER: 9.2.6
-            ARCH: 64
-          - os: windows-latest
-            ARTIFACT: "x86_64-mingw64-ghcup"
-            GHC_VER: 8.10.7
-            ARCH: 64
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-
-      - 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 }}
-          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: always()
-        name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: artifacts
-          path: |
-            ./out/*
-
-  test-linux:
-    name: Test linux
-    needs: "build-linux"
-    runs-on: ${{ matrix.os }}
-    env:
-      CABAL_VER: 3.10.1.0
-      JSON_VERSION: "0.0.7"
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            ARTIFACT: "i386-linux-ghcup"
-            GHC_VER: 8.10.7
-            ARCH: 32
-            DISTRO: Alpine
-          - os: ubuntu-latest
-            ARTIFACT: "x86_64-linux-ghcup"
-            GHC_VER: 8.10.7
-            ARCH: 64
-            DISTRO: Alpine
-          - os: ubuntu-latest
-            ARTIFACT: "x86_64-linux-ghcup"
-            GHC_VER: 8.10.7
-            ARCH: 64
-            DISTRO: Ubuntu
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: artifacts
-          path: ./out
-
-      - if: matrix.ARCH == '32' && matrix.DISTRO == 'Alpine'
-        name: Run test (32 bit linux Alpine)
-        uses: docker://hasufell/i386-alpine-haskell:3.12
-        with:
-          args: sh .github/scripts/test.sh
-        env:
-          ARTIFACT: ${{ matrix.ARTIFACT }}
-          ARCH: ${{ matrix.ARCH }}
-          GHC_VER: ${{ matrix.GHC_VER }}
-          DISTRO: ${{ matrix.DISTRO }}
-
-      - if: matrix.ARCH == '64' && matrix.DISTRO == 'Alpine'
-        name: Run test (64 bit linux Alpine)
-        uses: docker://hasufell/alpine-haskell:3.12
-        with:
-          args: sh .github/scripts/test.sh
-        env:
-          ARTIFACT: ${{ matrix.ARTIFACT }}
-          ARCH: ${{ matrix.ARCH }}
-          GHC_VER: ${{ matrix.GHC_VER }}
-          DISTRO: ${{ matrix.DISTRO }}
-
-      - if: matrix.DISTRO != 'Alpine'
-        name: Run test (64 bit linux)
-        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 }}
-
-      - if: failure()
-        name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: testfiles
-          path: |
-            ./test/ghcup-test/golden/unix/GHCupInfo*json
-
-  test-arm:
-    name: Test ARM
-    needs: "build-arm"
-    runs-on: ${{ matrix.os }}
-    env:
-      CABAL_VER: 3.10.1.0
-      JSON_VERSION: "0.0.7"
-    strategy:
-      matrix:
-        include:
-          - os: [self-hosted, Linux, ARM64]
-            ARTIFACT: "armv7-linux-ghcup"
-            GHC_VER: 9.2.2
-            ARCH: ARM
-            DISTRO: Ubuntu
-          - os: [self-hosted, Linux, ARM64]
-            ARTIFACT: "aarch64-linux-ghcup"
-            GHC_VER: 9.2.6
-            ARCH: ARM64
-            DISTRO: Ubuntu
-
-    steps:
-      - uses: docker://arm64v8/debian:10
-        name: Cleanup (aarch64 linux)
-        with:
-          args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
-
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: artifacts
-          path: ./out
-
-      - if: matrix.ARCH == 'ARM'
-        uses: docker://hasufell/arm32v7-debian-haskell:10
-        name: Run test (armv7 linux)
-        with:
-          args: sh .github/scripts/test.sh
-        env:
-          ARTIFACT: ${{ matrix.ARTIFACT }}
-          ARCH: ${{ matrix.ARCH }}
-          GHC_VER: ${{ matrix.GHC_VER }}
-          DISTRO: Ubuntu
-
-      - if: matrix.ARCH == 'ARM64'
-        uses: docker://hasufell/arm64v8-debian-haskell:10
-        name: Run test (aarch64 linux)
-        with:
-          args: sh .github/scripts/test.sh
-        env:
-          ARTIFACT: ${{ matrix.ARTIFACT }}
-          ARCH: ${{ matrix.ARCH }}
-          GHC_VER: ${{ matrix.GHC_VER }}
-          DISTRO: Ubuntu
-
-      - if: failure()
-        name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: testfiles
-          path: |
-            ./test/ghcup-test/golden/unix/GHCupInfo*json
-
-  test-macwin:
-    name: Test Mac/Win
-    needs: "build-macwin"
-    runs-on: ${{ matrix.os }}
-    env:
-      CABAL_VER: 3.10.1.0
-      MACOSX_DEPLOYMENT_TARGET: 10.13
-      JSON_VERSION: "0.0.7"
-    strategy:
-      matrix:
-        include:
-          - os: [self-hosted, macOS, ARM64]
-            ARTIFACT: "aarch64-apple-darwin-ghcup"
-            GHC_VER: 9.2.6
-            ARCH: ARM64
-            DISTRO: na
-          - os: macOS-11
-            ARTIFACT: "x86_64-apple-darwin-ghcup"
-            GHC_VER: 9.2.6
-            ARCH: 64
-            DISTRO: na
-          - os: windows-latest
-            ARTIFACT: "x86_64-mingw64-ghcup"
-            GHC_VER: 8.10.7
-            ARCH: 64
-            DISTRO: na
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: artifacts
-          path: ./out
-
-      - 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 }}
-          ARCH: ${{ matrix.ARCH }}
-          GHC_VER: ${{ matrix.GHC_VER }}
-          DISTRO: ${{ matrix.DISTRO }}
-          HOMEBREW_CHANGE_ARCH_TO_ARM: 1
-
-      - if: failure() && runner.os == 'Windows'
-        name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: testfiles
-          path: |
-            ./test/ghcup-test/golden/windows/GHCupInfo*json
-
-      - if: failure() && runner.os != 'Windows'
-        name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: testfiles
-          path: |
-            ./test/ghcup-test/golden/unix/GHCupInfo*json
-  hls:
-    name: hls
-    needs: build-linux
-    runs-on: ubuntu-latest
-    env:
-      GHC_VERSION: "8.10.7"
-      HLS_TARGET_VERSION: "1.8.0.0"
-      CABAL_VERSION: "3.8.1.0"
-      JSON_VERSION: "0.0.7"
-      ARTIFACT: "x86_64-linux-ghcup"
-      DISTRO: Ubuntu
-      ARCH: 64
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      S3_HOST: ${{ secrets.S3_HOST }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: artifacts
-          path: ./out
-
-      - name: Run hls build
-        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
-    needs: ["test-linux", "test-arm", "test-macwin", "hls"]
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/v')
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: artifacts
-          path: ./out
-
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        with:
-          draft: true
-          files: |
-            ./out/*

.github/workflows/shellcheck.yaml

@@ -1,28 +0,0 @@
-name: Shellcheck
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - 'v*'
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  shellcheck:
-    name: shellcheck
-    runs-on: ubuntu-latest
-    env:
-      JSON_VERSION: "0.0.7"
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-
-      - name: Run shellcheck
-        uses: docker://koalaman/shellcheck-alpine
-        with:
-          args: shellcheck scripts/bootstrap/bootstrap-haskell

.gitlab-ci.yml

@@ -11,13 +11,6 @@ variables:
   # Commit of ghc/ci-images repository from which to pull Docker images
   DOCKER_REV: 8d0224e6b2a08157649651e69302380b2bd24e11
 
-  # Sequential version number of all cached things.
-  # Bump to invalidate GitLab CI cache.
-  CACHE_REV: 1
-
-  GIT_SUBMODULE_STRATEGY: recursive
-
-
 ############################################################
 # CI Step
 ############################################################
@@ -118,17 +111,13 @@ variables:
   script:
     - bash ./.gitlab/script/ghcup_version.sh
   variables:
-    JSON_VERSION: "0.0.7"
+    JSON_VERSION: "0.0.6"
   artifacts:
     expire_in: 2 week
     paths:
       - test/golden
       - dist-newstyle/cache/
     when: on_failure
-  cache:
-    key: ghcup-test-$CACHE_REV
-    paths:
-      - cabal-cache
 
 # .test_ghcup_scoop:
   # script:
@@ -140,10 +129,6 @@ variables:
     - .debian
   before_script:
     - ./.gitlab/before_script/linux/install_deps.sh
-    - ./.gitlab/script/ci.sh extract_cabal_cache
-  after_script:
-    - ./.gitlab/script/ci.sh save_cabal_cache
-    - bash ./.gitlab/after_script.sh
 
 .test_ghcup_version:linux32:
   extends:
@@ -151,10 +136,6 @@ variables:
     - .alpine:32bit
   before_script:
     - ./.gitlab/before_script/linux/alpine/install_deps.sh
-    - ./.gitlab/script/ci.sh extract_cabal_cache
-  after_script:
-    - ./.gitlab/script/ci.sh save_cabal_cache
-    - bash ./.gitlab/after_script.sh
 
 .test_ghcup_version:armv7:
   extends:
@@ -162,10 +143,6 @@ variables:
     - .linux:armv7
   before_script:
     - ./.gitlab/before_script/linux/install_deps.sh
-    - ./.gitlab/script/ci.sh extract_cabal_cache
-  after_script:
-    - ./.gitlab/script/ci.sh save_cabal_cache
-    - bash ./.gitlab/after_script.sh
 
 .test_ghcup_version:aarch64:
   extends:
@@ -173,96 +150,71 @@ variables:
     - .linux:aarch64
   before_script:
     - ./.gitlab/before_script/linux/install_deps.sh
-    - ./.gitlab/script/ci.sh extract_cabal_cache
-  after_script:
-    - ./.gitlab/script/ci.sh save_cabal_cache
-    - bash ./.gitlab/after_script.sh
 
 .test_ghcup_version:darwin:
   extends:
     - .test_ghcup_version
     - .darwin
+    - .root_cleanup
   before_script:
     - ./.gitlab/before_script/darwin/install_deps.sh
-    - ./.gitlab/script/ci.sh extract_cabal_cache
-  after_script:
-    - ./.gitlab/script/ci.sh save_cabal_cache
-    - bash ./.gitlab/after_script.sh
 
 .test_ghcup_version:darwin:aarch64:
   extends:
     - .test_ghcup_version
     - .darwin:aarch64
-  cache:
-    key: darwin-brew-$CACHE_REV
-    paths:
-      - brew_cache
-    key: ghcup-test-$CACHE_REV
-    paths:
-      - cabal-cache
-  before_script:
-    # extract brew cache
-    - ./.gitlab/script/ci.sh extract_brew_cache
-    # otherwise we seem to get intel binaries
-    - export HOMEBREW_CHANGE_ARCH_TO_ARM=1
-    # update and install packages
-    - /bin/bash ./.gitlab/script/brew.sh llvm autoconf automake coreutils
-    # extract cabal cache
-    - ./.gitlab/script/ci.sh extract_cabal_cache
+    - .root_cleanup
   script: |
-    export PATH="$CI_PROJECT_DIR/.brew/opt/llvm/bin:$CI_PROJECT_DIR/.brew/bin:$CI_PROJECT_DIR/.brew/sbin:$PATH"
-    export CC=$CI_PROJECT_DIR/.brew/opt/llvm/bin/clang
-    export CXX=$CI_PROJECT_DIR/.brew/opt/llvm/bin/clang++
-    export LD=ld
-    export AR=$CI_PROJECT_DIR/.brew/opt/llvm/bin/llvm-ar
-    export RANLIB=$CI_PROJECT_DIR/.brew/opt/llvm/bin/llvm-ranlib
-    ./.gitlab/before_script/darwin/install_deps.sh
-    ./.gitlab/script/ghcup_version.sh
-  after_script:
-    - ./.gitlab/script/ci.sh save_cabal_cache
-    - ./.gitlab/script/ci.sh save_brew_cache
-    - bash ./.gitlab/after_script.sh
+    set -Eeuo pipefail
+    function runInNixShell() {
+      time nix-shell $CI_PROJECT_DIR/.gitlab/shell.nix \
+        -I nixpkgs=https://github.com/angerman/nixpkgs/archive/75f7281738b.tar.gz \
+        --argstr system "aarch64-darwin" \
+        --pure \
+        --keep CI_PROJECT_DIR \
+        --keep MACOSX_DEPLOYMENT_TARGET \
+        --keep JSON_VERSION \
+        --keep ARTIFACT \
+        --keep OS \
+        --keep ARCH \
+        --keep CABAL_DIR \
+        --keep GHC_VERSION \
+        --keep CABAL_VERSION \
+        --run "$1" 2>&1
+    }
+    runInNixShell ./.gitlab/before_script/darwin/install_deps.sh 2>&1
+    runInNixShell ./.gitlab/script/ghcup_version.sh 2>&1
 
 .test_ghcup_version:freebsd12:
   extends:
     - .test_ghcup_version
     - .freebsd12
+    - .root_cleanup
   before_script:
     - ./.gitlab/before_script/freebsd/install_deps.sh
-    - ./.gitlab/script/ci.sh extract_cabal_cache
-  after_script:
-    - ./.gitlab/script/ci.sh save_cabal_cache
-    - bash ./.gitlab/after_script.sh
 
 .test_ghcup_version:freebsd13:
   extends:
     - .test_ghcup_version
     - .freebsd13
+    - .root_cleanup
   before_script:
-    - sudo pkg update
-    - sudo pkg install --yes compat12x-amd64
-    - sudo ln -s libncurses.so.6 /usr/local/lib/libncurses.so.6.2
     - ./.gitlab/before_script/freebsd/install_deps.sh
-    - ./.gitlab/script/ci.sh extract_cabal_cache
-  after_script:
-    - ./.gitlab/script/ci.sh save_cabal_cache
-    - bash ./.gitlab/after_script.sh
 
 .test_ghcup_version:windows:
   extends:
     - .test_ghcup_version
     - .windows
+    - .root_cleanup
   before_script:
+    - set CABAL_DIR="$CI_PROJECT_DIR/cabal"
     - bash ./.gitlab/before_script/windows/install_deps.sh
-    - bash ./.gitlab/script/ci.sh extract_cabal_cache
-  after_script:
-    - bash ./.gitlab/script/ci.sh save_cabal_cache
-    - bash ./.gitlab/after_script.sh
 
 # .test_ghcup_scoop:windows:
   # extends:
     # - .windows
     # - .test_ghcup_scoop
+    # - .root_cleanup
 
 .release_ghcup:
   script:
@@ -275,19 +227,16 @@ variables:
   only:
     - tags
   variables:
-    JSON_VERSION: "0.0.7"
+    JSON_VERSION: "0.0.6"
 
 ######## stack test ########
 
 test:linux:stack:
   stage: test
   before_script:
-    - ./.gitlab/script/ci.sh extract_stack_cache
     - ./.gitlab/before_script/linux/install_deps_minimal.sh
   script:
     - ./.gitlab/script/ghcup_stack.sh
-  after_script:
-    - ./.gitlab/script/ci.sh save_stack_cache
   extends:
     - .debian
   needs: []
@@ -317,7 +266,6 @@ test:windows:bootstrap_powershell_script:
     - "[Environment]::SetEnvironmentVariable('GHCUP_MSYS2', $null, [System.EnvironmentVariableTarget]::User)"
     - "[Environment]::SetEnvironmentVariable('CABAL_DIR', $null, [System.EnvironmentVariableTarget]::User)"
     - bash ./.gitlab/after_script.sh
-    - bash ./.gitlab/script/ci.sh save_cabal_cache
   variables:
     GHC_VERSION: "8.10.7"
     CABAL_VERSION: "3.6.2.0"
@@ -440,7 +388,6 @@ test:mac:aarch64:
     CABAL_VERSION: "3.6.2.0"
   needs: []
   allow_failure: true
-  when: manual
 
 
 ######## freebsd test ########
@@ -561,39 +508,32 @@ release:darwin:aarch64:
     - .darwin:aarch64
     - .release_ghcup
     - .root_cleanup
-  cache:
-    key: darwin-brew-$CACHE_REV
-    paths:
-      - brew_cache
-    key: ghcup-test-$CACHE_REV
-    paths:
-      - cabal-cache
-  before_script:
-    - ./.gitlab/script/ci.sh extract_brew_cache
-    - ./.gitlab/script/ci.sh extract_cabal_cache
-    # otherwise we seem to get intel binaries
-    - export HOMEBREW_CHANGE_ARCH_TO_ARM=1
-    # update and install packages
-    - /bin/bash ./.gitlab/script/brew.sh llvm autoconf automake coreutils
   script: |
-    export PATH="$CI_PROJECT_DIR/.brew/opt/llvm/bin:$CI_PROJECT_DIR/.brew/bin:$CI_PROJECT_DIR/.brew/sbin:$PATH"
-    export CC=$CI_PROJECT_DIR/.brew/opt/llvm/bin/clang
-    export CXX=$CI_PROJECT_DIR/.brew/opt/llvm/bin/clang++
-    export LD=ld
-    export AR=$CI_PROJECT_DIR/.brew/opt/llvm/bin/llvm-ar
-    export RANLIB=$CI_PROJECT_DIR/.brew/opt/llvm/bin/llvm-ranlib
-    ./.gitlab/before_script/darwin/install_deps.sh
-    ./.gitlab/script/ghcup_release.sh
-  after_script:
-    - ./.gitlab/script/ci.sh save_cabal_cache
-    - ./.gitlab/script/ci.sh save_brew_cache
+    set -Eeuo pipefail
+    function runInNixShell() {
+      time nix-shell $CI_PROJECT_DIR/.gitlab/shell.nix \
+        -I nixpkgs=https://github.com/angerman/nixpkgs/archive/75f7281738b.tar.gz \
+        --argstr system "aarch64-darwin" \
+        --pure \
+        --keep CI_PROJECT_DIR \
+        --keep MACOSX_DEPLOYMENT_TARGET \
+        --keep JSON_VERSION \
+        --keep ARTIFACT \
+        --keep OS \
+        --keep ARCH \
+        --keep CABAL_DIR \
+        --keep GHC_VERSION \
+        --keep CABAL_VERSION \
+        --run "$1" 2>&1
+    }
+    runInNixShell ./.gitlab/before_script/darwin/install_deps.sh 2>&1
+    runInNixShell ./.gitlab/script/ghcup_release.sh 2>&1
   variables:
     ARTIFACT: "aarch64-apple-darwin-ghcup"
     GHC_VERSION: "8.10.7"
     CABAL_VERSION: "3.6.2.0"
     MACOSX_DEPLOYMENT_TARGET: "10.7"
   allow_failure: true
-  when: manual
 
 
 ######## freebsd release ########
@@ -621,9 +561,6 @@ release:freebsd13:
     - .release_ghcup
     - .root_cleanup
   before_script:
-    - sudo pkg update
-    - sudo pkg install --yes compat12x-amd64
-    - sudo ln -s libncurses.so.6 /usr/local/lib/libncurses.so.6.2
     - ./.gitlab/before_script/freebsd/install_deps.sh
   variables:
     ARTIFACT: "x86_64-portbld-freebsd-ghcup"

.gitlab/after_script.sh

@@ -12,8 +12,4 @@ if [ "${OS}" = "WINDOWS" ] ; then
 	rm -Rf /c/ghcup
 fi
 
-if [ "${OS}" = "DARWIN" ] ; then
-	rm -Rf /private/tmp/.brew_tmp
-fi
-
 exit 0

.gitlab/before_script/freebsd/install_deps.sh

@@ -8,15 +8,7 @@ set -eux
 
 mkdir -p "${TMPDIR}"
 
-if freebsd-version | grep -E '^12.*' ; then
-	freebsd_ver=12
-elif freebsd-version | grep -E '^13.*' ; then
-	freebsd_ver=13
-else
-	(>&2 echo "Unsupported FreeBSD version! Please report a bug at https://gitlab.haskell.org/haskell/ghcup-hs/-/issues")
-	exit 1
-fi
-curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-freebsd${freebsd_ver}-ghcup > ./ghcup-bin
+curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-portbld-freebsd-ghcup > ./ghcup-bin
 chmod +x ghcup-bin
 
 ./ghcup-bin -v upgrade -i -f

.gitlab/ghcup-run.files

@@ -1,37 +0,0 @@
-.
-./cabal
-./ghc
-./ghc-8.10.7
-./ghc-pkg
-./ghc-pkg-8.10.7
-./ghci
-./ghci-8.10.7
-./haddock
-./haddock-8.10.7
-./haskell-language-server-8.10.6
-./haskell-language-server-8.10.6~1.6.1.0
-./haskell-language-server-8.10.7
-./haskell-language-server-8.10.7~1.6.1.0
-./haskell-language-server-8.6.5
-./haskell-language-server-8.6.5~1.6.1.0
-./haskell-language-server-8.8.4
-./haskell-language-server-8.8.4~1.6.1.0
-./haskell-language-server-9.0.1
-./haskell-language-server-9.0.1~1.6.1.0
-./haskell-language-server-9.0.2
-./haskell-language-server-9.0.2~1.6.1.0
-./haskell-language-server-9.2.1
-./haskell-language-server-9.2.1~1.6.1.0
-./haskell-language-server-wrapper
-./haskell-language-server-wrapper-1.6.1.0
-./hp2ps
-./hp2ps-8.10.7
-./hpc
-./hpc-8.10.7
-./hsc2hs
-./hsc2hs-8.10.7
-./runghc
-./runghc-8.10.7
-./runhaskell
-./runhaskell-8.10.7
-./stack

.gitlab/ghcup-run.files.windows

@@ -1,81 +0,0 @@
-.
-./cabal.exe
-./cabal.shim
-./ghc-8.10.7.exe
-./ghc-8.10.7.shim
-./ghc-pkg-8.10.7.exe
-./ghc-pkg-8.10.7.shim
-./ghc-pkg.exe
-./ghc-pkg.shim
-./ghc.exe
-./ghc.shim
-./ghci-8.10.7.exe
-./ghci-8.10.7.shim
-./ghci.exe
-./ghci.shim
-./ghcii-8.10.7.sh-8.10.7.exe
-./ghcii-8.10.7.sh-8.10.7.shim
-./ghcii-8.10.7.sh.exe
-./ghcii-8.10.7.sh.shim
-./ghcii.sh-8.10.7.exe
-./ghcii.sh-8.10.7.shim
-./ghcii.sh.exe
-./ghcii.sh.shim
-./haddock-8.10.7.exe
-./haddock-8.10.7.shim
-./haddock.exe
-./haddock.shim
-./haskell-language-server-8.10.6.exe
-./haskell-language-server-8.10.6.shim
-./haskell-language-server-8.10.6~1.6.1.0.exe
-./haskell-language-server-8.10.6~1.6.1.0.shim
-./haskell-language-server-8.10.7.exe
-./haskell-language-server-8.10.7.shim
-./haskell-language-server-8.10.7~1.6.1.0.exe
-./haskell-language-server-8.10.7~1.6.1.0.shim
-./haskell-language-server-8.6.5.exe
-./haskell-language-server-8.6.5.shim
-./haskell-language-server-8.6.5~1.6.1.0.exe
-./haskell-language-server-8.6.5~1.6.1.0.shim
-./haskell-language-server-8.8.4.exe
-./haskell-language-server-8.8.4.shim
-./haskell-language-server-8.8.4~1.6.1.0.exe
-./haskell-language-server-8.8.4~1.6.1.0.shim
-./haskell-language-server-9.0.1.exe
-./haskell-language-server-9.0.1.shim
-./haskell-language-server-9.0.1~1.6.1.0.exe
-./haskell-language-server-9.0.1~1.6.1.0.shim
-./haskell-language-server-9.0.2.exe
-./haskell-language-server-9.0.2.shim
-./haskell-language-server-9.0.2~1.6.1.0.exe
-./haskell-language-server-9.0.2~1.6.1.0.shim
-./haskell-language-server-9.2.1.exe
-./haskell-language-server-9.2.1.shim
-./haskell-language-server-9.2.1~1.6.1.0.exe
-./haskell-language-server-9.2.1~1.6.1.0.shim
-./haskell-language-server-wrapper-1.6.1.0.exe
-./haskell-language-server-wrapper-1.6.1.0.shim
-./haskell-language-server-wrapper.exe
-./haskell-language-server-wrapper.shim
-./hp2ps-8.10.7.exe
-./hp2ps-8.10.7.shim
-./hp2ps.exe
-./hp2ps.shim
-./hpc-8.10.7.exe
-./hpc-8.10.7.shim
-./hpc.exe
-./hpc.shim
-./hsc2hs-8.10.7.exe
-./hsc2hs-8.10.7.shim
-./hsc2hs.exe
-./hsc2hs.shim
-./runghc-8.10.7.exe
-./runghc-8.10.7.shim
-./runghc.exe
-./runghc.shim
-./runhaskell-8.10.7.exe
-./runhaskell-8.10.7.shim
-./runhaskell.exe
-./runhaskell.shim
-./stack.exe
-./stack.shim

.gitlab/ghcup_env

@@ -1,23 +1,11 @@
 if [ "${OS}" = "WINDOWS" ] ; then
-    export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR"
-    export GHCUP_BIN="$CI_PROJECT_DIR/ghcup/bin"
-    export PATH="$GHCUP_BIN:$CI_PROJECT_DIR/.local/bin:$PATH"
-    export TMPDIR="$CI_PROJECT_DIR/tmp"
-    export CABAL_DIR="$CI_PROJECT_DIR/cabal"
-    export CABAL_CACHE="$CI_PROJECT_DIR/cabal-cache"
-    export STACK_ROOT="$CI_PROJECT_DIR/stack"
-    export STACK_CACHE="$CI_PROJECT_DIR/stack-cache"
-    export BREW_DIR="$CI_PROJECT_DIR/.brew_cache"
-    export BREW_CACHE="$CI_PROJECT_DIR/brew-cache"
+	export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR"
+	export GHCUP_BIN="$CI_PROJECT_DIR/ghcup/bin"
+	export PATH="$GHCUP_BIN:$CI_PROJECT_DIR/.local/bin:$PATH"
+	export TMPDIR="$CI_PROJECT_DIR/tmp"
 else
-    export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR"
-    export GHCUP_BIN="$CI_PROJECT_DIR/.ghcup/bin"
-    export PATH="$GHCUP_BIN:$CI_PROJECT_DIR/.local/bin:$PATH"
-    export TMPDIR="$CI_PROJECT_DIR/tmp"
-    export CABAL_DIR="$CI_PROJECT_DIR/cabal"
-    export CABAL_CACHE="$CI_PROJECT_DIR/cabal-cache"
-    export STACK_ROOT="$CI_PROJECT_DIR/stack"
-    export STACK_CACHE="$CI_PROJECT_DIR/stack-cache"
-    export BREW_DIR="$CI_PROJECT_DIR/.brew_cache"
-    export BREW_CACHE="$CI_PROJECT_DIR/brew-cache"
+	export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR"
+	export GHCUP_BIN="$CI_PROJECT_DIR/.ghcup/bin"
+	export PATH="$GHCUP_BIN:$CI_PROJECT_DIR/.local/bin:/opt/llvm/bin:$PATH"
+	export TMPDIR="$CI_PROJECT_DIR/tmp"
 fi

.gitlab/script/brew.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-set -Eeuxo pipefail
-
-# Install brew locally in the project dir. Packages will also be installed here.
-[ -e "$CI_PROJECT_DIR/.brew" ] || git clone --depth=1 https://github.com/Homebrew/brew $CI_PROJECT_DIR/.brew
-export PATH="$CI_PROJECT_DIR/.brew/bin:$CI_PROJECT_DIR/.brew/sbin:$PATH"
-
-# make sure to not pollute the machine with temp files etc
-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
-
-# update and install packages
-brew update
-brew install ${1+"$@"}

.gitlab/script/ci.sh

@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-
-set -Eeuo pipefail
-
-TOP="$( cd "$(dirname "$0")" ; pwd -P )"
-. "${TOP}/../ghcup_env"
-
-function save_cabal_cache () {
-  echo "Storing cabal cache from $CABAL_DIR to $CABAL_CACHE..."
-  rm -Rf "$CABAL_CACHE"
-  mkdir -p "$CABAL_CACHE"
-  if [ -d "$CABAL_DIR" ]; then
-	  cp -Rf "$CABAL_DIR" "$CABAL_CACHE/"
-  fi
-}
-
-
-function extract_cabal_cache () {
-  if [ -d "$CABAL_CACHE" ]; then
-      echo "Extracting cabal cache from $CABAL_CACHE to $CABAL_DIR..."
-      mkdir -p "$CABAL_DIR"
-      cp -Rf "$CABAL_CACHE"/* "$CABAL_DIR"
-  fi
-}
-
-function save_stack_cache () {
-  echo "Storing stack cache from $STACK_ROOT to $STACK_CACHE..."
-  rm -Rf "$STACK_CACHE"
-  mkdir -p "$STACK_CACHE"
-  if [ -d "$STACK_ROOT" ]; then
-	  cp -Rf "$STACK_DIR" "$STACK_CACHE"
-  fi
-}
-
-
-function extract_stack_cache () {
-  if [ -d "$STACK_CACHE" ]; then
-      echo "Extracting stack cache from $STACK_CACHE to $STACK_ROOT..."
-      mkdir -p "$STACK_ROOT"
-      cp -Rf "$STACK_CACHE"/* "$STACK_ROOT"
-  fi
-}
-
-function save_brew_cache () {
-  echo "Storing brew cache from $BREW_DIR to $BREW_CACHE..."
-  rm -Rf "$BREW_CACHE"
-  mkdir -p "$BREW_CACHE"
-  if [ -d "$BREW_DIR" ]; then
-	  cp -Rf "$BREW_DIR" "$BREW_CACHE"
-  fi
-}
-
-
-function extract_brew_cache () {
-  if [ -d "$BREW_CACHE" ]; then
-      echo "Extracting stack cache from $BREW_CACHE to $BREW_DIR..."
-      mkdir -p "$BREW_DIR"
-      cp -Rf "$BREW_CACHE"/* "$BREW_DIR"
-  fi
-}
-
-case $1 in
-  extract_cabal_cache) extract_cabal_cache ;;
-  save_cabal_cache) save_cabal_cache ;;
-  extract_stack_cache) extract_stack_cache ;;
-  save_stack_cache) save_stack_cache ;;
-  extract_brew_cache) extract_brew_cache ;;
-  save_brew_cache) save_brew_cache ;;
-  *) echo "unknown mode $1" ; exit 11 ;;
-esac

.gitlab/script/ghcup_bootstrap.sh

@@ -6,10 +6,20 @@ set -eux
 
 mkdir -p "$CI_PROJECT_DIR"/.local/bin
 
+ecabal() {
+	cabal "$@"
+}
+
+eghcup() {
+	ghcup -v -c -s file://$(pwd)/ghcup-${JSON_VERSION}.yaml "$@"
+}
+
 git describe --always
 
 ### build
 
+ecabal update
+
 export BOOTSTRAP_HASKELL_NONINTERACTIVE=yes
 export BOOTSTRAP_HASKELL_GHC_VERSION=$GHC_VERSION
 export BOOTSTRAP_HASKELL_CABAL_VERSION=$CABAL_VERSION

.gitlab/script/ghcup_hls.sh

@@ -41,7 +41,7 @@ cabal --version
 
 eghcup debug-info
 
-eghcup compile hls -j $(nproc) -v ${HLS_TARGET_VERSION} --ghc ${GHC_VERSION}
+eghcup compile hls -j $(nproc) -v ${HLS_TARGET_VERSION} ${GHC_VERSION}
 
 [ `$(eghcup whereis hls ${HLS_TARGET_VERSION}) --numeric-version` = "${HLS_TARGET_VERSION}" ] || [ `$(eghcup whereis hls ${HLS_TARGET_VERSION}) --numeric-version | sed 's/.0$//'` = "${HLS_TARGET_VERSION}" ]
 

.gitlab/script/ghcup_version.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 set -eux
 
@@ -8,7 +8,6 @@ mkdir -p "$CI_PROJECT_DIR"/.local/bin
 
 CI_PROJECT_DIR=$(pwd)
 
-
 ecabal() {
 	cabal "$@"
 }
@@ -35,8 +34,6 @@ git describe --always
 
 ### build
 
-rm -rf "${GHCUP_DIR}"/share
-
 ecabal update
 
 if [ "${OS}" = "DARWIN" ] ; then
@@ -86,6 +83,7 @@ else
 	ext=''
 fi
 	cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup')" "$CI_PROJECT_DIR"/.local/bin/ghcup${ext}
+	cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup-gen')" "$CI_PROJECT_DIR"/.local/bin/ghcup-gen${ext}
 
 ### cleanup
 
@@ -94,41 +92,19 @@ rm -rf "${GHCUP_DIR}"
 ### manual cli based testing
 
 
+ghcup-gen check -f data/metadata/ghcup-${JSON_VERSION}.yaml
+
 eghcup --numeric-version
 
 eghcup install ghc ${GHC_VERSION}
-eghcup unset ghc ${GHC_VERSION}
-ls -lah "$(eghcup whereis -d ghc ${GHC_VERSION})"
-[ "`$(eghcup whereis ghc ${GHC_VERSION}) --numeric-version`" = "${GHC_VERSION}" ]
-[ "`eghcup run --ghc ${GHC_VERSION} -- ghc --numeric-version`" = "${GHC_VERSION}" ]
-[ "`ghcup run --ghc ${GHC_VERSION} -- ghc -e 'Control.Monad.join (Control.Monad.fmap System.IO.putStr System.Environment.getExecutablePath)'`" = "`$(ghcup whereis ghc ${GHC_VERSION}) -e 'Control.Monad.join (Control.Monad.fmap System.IO.putStr System.Environment.getExecutablePath)'`" ]
+[ `$(eghcup whereis ghc ${GHC_VERSION}) --numeric-version` = "${GHC_VERSION}" ]
 eghcup set ghc ${GHC_VERSION}
 eghcup install cabal ${CABAL_VERSION}
-[ "`$(eghcup whereis cabal ${CABAL_VERSION}) --numeric-version`" = "${CABAL_VERSION}" ]
+[ `$(eghcup whereis cabal ${CABAL_VERSION}) --numeric-version` = "${CABAL_VERSION}" ]
 eghcup unset cabal
-"$GHCUP_BIN"/cabal --version && exit 1 || echo yes
-
-# make sure no cabal is set when running 'ghcup run' to check that PATH propagages properly
-# https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/375
-[ "`eghcup run --cabal ${CABAL_VERSION} -- cabal --numeric-version`" = "${CABAL_VERSION}" ]
+"$GHCUP_BIN"/cabal --version && exit || echo yes
 eghcup set cabal ${CABAL_VERSION}
-
-[ "`$(eghcup whereis cabal ${CABAL_VERSION}) --numeric-version`" = "${CABAL_VERSION}" ]
-
-if [ "${OS}" != "FREEBSD" ] ; then
-	if [ "${ARCH}" = "64" ] ; then
-		eghcup run --ghc 8.10.7 --cabal 3.4.1.0 --hls 1.6.1.0 --stack 2.7.3 --install --bindir "$(pwd)/.bin"
-		if [ "${OS}" == "WINDOWS" ] ; then
-			expected=$(cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghcup-run.files.windows" | sort)
-		else
-			expected=$(cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghcup-run.files" | sort)
-		fi
-		actual=$(cd ".bin" && find . | sort)
-		[ "${actual}" = "${expected}" ]
-		unset actual expected
-		rm -rf .bin
-	fi
-fi
+[ `$(eghcup whereis cabal ${CABAL_VERSION}) --numeric-version` = "${CABAL_VERSION}" ]
 
 cabal --version
 
@@ -158,7 +134,7 @@ else
 		eghcup --offline install ghc 8.10.3
 		if [ "${ARCH}" = "64" ] ; then
 			expected=$(cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghc-8.10.3-linux.files" | sort)
-			actual=$(cd "${GHCUP_DIR}/ghc/8.10.3/" && find . | sort)
+			actual=$(cd "${GHCUP_DIR}/ghc/8.10.3/" && find | sort)
 			[ "${actual}" = "${expected}" ]
 			unset actual expected
 		fi
@@ -166,7 +142,7 @@ else
 		eghcup prefetch ghc 8.10.3
 		eghcup --offline install ghc 8.10.3
 		expected=$(cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghc-8.10.3-windows.files" | sort)
-		actual=$(cd "${GHCUP_DIR}/ghc/8.10.3/" && find . | sort)
+		actual=$(cd "${GHCUP_DIR}/ghc/8.10.3/" && find | sort)
 		[ "${actual}" = "${expected}" ]
 		unset actual expected
 	else
@@ -180,14 +156,12 @@ else
 	eghcup set ${GHC_VERSION}
 	[ "$(ghc --numeric-version)" = "${ghc_ver}" ]
 	eghcup unset ghc
-    "$GHCUP_BIN"/ghc --numeric-version && exit 1 || echo yes
+    "$GHCUP_BIN"/ghc --numeric-version && exit || echo yes
 	eghcup set ${GHC_VERSION}
 	eghcup --offline rm 8.10.3
 	[ "$(ghc --numeric-version)" = "${ghc_ver}" ]
 
 
-	ls -lah "$GHCUP_BIN"
-
 	if [ "${OS}" = "DARWIN" ] ; then
 		eghcup install hls
 		$(eghcup whereis hls) --version
@@ -199,18 +173,16 @@ else
 			eghcup install hls
 			haskell-language-server-wrapper --version
 			eghcup unset hls
-			"$GHCUP_BIN"/haskell-language-server-wrapper --version && exit 1 || echo yes
+			"$GHCUP_BIN"/haskell-language-server-wrapper --version && exit || echo yes
 
 			eghcup install stack
 			stack --version
-			eghcup unset stack
-			"$GHCUP_BIN"/stack --version && exit 1 || echo yes
+			eghcup unset hls
+			"$GHCUP_BIN"/stack --version && exit || echo yes
 		fi
 	fi
 fi
 
-
-
 # check that lazy loading works for 'whereis'
 cp "$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml" "$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml.bak"
 echo '**' > "$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml"
@@ -222,13 +194,11 @@ eghcup rm $(ghc --numeric-version)
 # https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/116
 if [ "${OS}" = "LINUX" ] ; then
 	if [ "${ARCH}" = "64" ] ; then
-		eghcup install cabal -u https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.7.0.0-pre20220407/cabal-install-3.7-x86_64-linux-alpine.tar.xz 3.4.0.0-rc4
+		eghcup install cabal -u https://oleg.fi/cabal-install-3.4.0.0-rc4/cabal-install-3.4.0.0-x86_64-ubuntu-16.04.tar.xz 3.4.0.0-rc4
 		eghcup rm cabal 3.4.0.0-rc4
 	fi
 fi
 
-eghcup gc -c
-
 sha_sum() {
 	if [ "${OS}" = "FREEBSD" ] ; then
 		sha256 "$@"
@@ -276,39 +246,13 @@ if [ "${ARCH}" = "64" ] ; then
 		eghcup install hls -i "$(pwd)/isolated" 1.3.0
 		[ "$(isolated/haskell-language-server-wrapper --numeric-version)" = "1.3.0" ] ||
 			[ "$(isolated/haskell-language-server-wrapper --numeric-version)" = "1.3.0.0" ]
-
-		# test that isolated installs don't clean up target directory
-		cat <<EOF > "${GHCUP_BIN}/gmake"
-#!/bin/bash
-exit 1
-EOF
-		chmod +x "${GHCUP_BIN}/gmake"
-		mkdir isolated_tainted/
-		touch isolated_tainted/lol
-
-		! eghcup install ghc -i "$(pwd)/isolated_tainted" 8.10.5 --force
-		[ -e "$(pwd)/isolated_tainted/lol" ]
-		rm "${GHCUP_BIN}/gmake"
 	fi
 fi
 
 eghcup upgrade
 eghcup upgrade -f
 
-# 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 ]
-
-

.gitlab/script/hlint.sh

@@ -15,5 +15,5 @@ git describe
 ecabal update
 ecabal install -w ghc-${GHC_VERSION} --installdir="$CI_PROJECT_DIR"/.local/bin hlint
 
-hlint -r app/ lib/ test/ 
+hlint -r lib/ test/ 
 

.gitlab/shell.nix

@@ -0,0 +1,90 @@
+{ system ? "aarch64-darwin"
+#, nixpkgs ? fetchTarball https://github.com/angerman/nixpkgs/archive/257cb120334.tar.gz #apple-silicon.tar.gz
+, pkgs ? import <nixpkgs> { inherit system; }
+, compiler ? if system == "aarch64-darwin" then "ghc8103Binary" else "ghc8103"
+}: pkgs.mkShell {
+  # this prevents nix from trying to write the env-vars file.
+  # we can't really, as NIX_BUILD_TOP/env-vars is not set.
+  noDumpEnvVars=1;
+
+  # stop polluting LDFLAGS with -liconv
+  dontAddExtraLibs = true;
+
+  # we need to inject ncurses into --with-curses-libraries.
+  # the real fix is to teach terminfo to use libcurses on macOS.
+  # CONFIGURE_ARGS = "--with-intree-gmp --with-curses-libraries=${pkgs.ncurses.out}/lib";
+  CONFIGURE_ARGS = "--with-intree-gmp --with-curses-libraries=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib --with-iconv-includes=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include --with-iconv-libraries=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib SH=/bin/bash";
+
+  # magic speedup pony :facepalm:
+  #
+  # nix has the ugly habbit of duplicating ld flags more than necessary.  This
+  # somewhat consolidates this.
+  shellHook = ''
+  export NIX_LDFLAGS=$(for a in $NIX_LDFLAGS; do echo $a; done |sort|uniq|xargs)
+  export NIX_LDFLAGS_FOR_TARGET=$(for a in $NIX_LDFLAGS_FOR_TARGET; do echo $a; done |sort|uniq|xargs)
+  export NIX_LDFLAGS_FOR_TARGET=$(comm -3 <(for l in $NIX_LDFLAGS_FOR_TARGET; do echo $l; done) <(for l in $NIX_LDFLAGS; do echo $l; done))
+
+
+  # Impurity hack for GHC releases.
+  #################################
+  # We don't want binary releases to depend on nix, thus we'll need to make sure we don't leak in references.
+  # GHC externally depends only on iconv and curses.  However we can't force a specific curses library for
+  # the terminfo package, as such we'll need to make sure we only look in the system path for the curses library
+  # and not pick up the tinfo from the nix provided ncurses package.
+  #
+  # We also need to force us to use the systems COREFOUNDATION, not the one that nix builds. Again this is impure,
+  # but it will allow us to have proper binary distributions.
+  #
+  # do not use nixpkgs provided core foundation
+  export NIX_COREFOUNDATION_RPATH=/System/Library/Frameworks
+  # drop curses from the LDFLAGS, we really want the system ones, not the nix ones.
+  export NIX_LDFLAGS=$(for lib in $NIX_LDFLAGS; do case "$lib" in *curses*);; *) echo -n "$lib ";; esac; done;)
+  export NIX_CFLAGS_COMPILE+=" -Wno-nullability-completeness -Wno-availability -Wno-expansion-to-defined -Wno-builtin-requires-header -Wno-unused-command-line-argument"
+
+  # unconditionally add the MacOSX.sdk and TargetConditional.h
+  export NIX_CFLAGS_COMPILE+=" -isystem /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include"
+  export NIX_LDFLAGS="-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib $NIX_LDFLAGS"
+
+  '';
+
+  nativeBuildInputs = (with pkgs; [
+    # This needs to come *before* ghc,
+    # otherwise we migth end up with the clang from
+    # the bootstrap GHC in PATH with higher priority.
+    clang_11
+    llvm_11
+
+    haskell.compiler.${compiler}
+    haskell.packages.${compiler}.cabal-install
+    haskell.packages.${compiler}.alex
+    haskell.packages.${compiler}.happy # _1_19_12 is needed for older GHCs.
+
+    automake
+    autoconf
+    m4
+
+    gmp
+    zlib.out
+    zlib.dev
+    glibcLocales
+    # locale doesn't build yet :-/
+    # locale
+
+    git
+
+    python3
+    # python3Full
+    # python3Packages.sphinx
+    perl
+
+    which
+    wget
+	curl
+    file
+
+    xz
+    xlibs.lndir
+
+    cacert ])
+  ++ (with pkgs.darwin.apple_sdk.frameworks; [ Foundation Security ]);
+}

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "data/metadata"]
-	path = data/metadata
-	url = https://github.com/haskell/ghcup-metadata.git
-	branch = develop

.hlint.yaml

@@ -20,7 +20,6 @@
 - ignore: {name: "Avoid lambda"}
 - ignore: {name: "Use uncurry"}
 - ignore: {name: "Use replicateM"}
-- ignore: {name: "Use unless"}
 - ignore: {name: "Redundant irrefutable pattern"}
 
 

.travis.yml

@@ -0,0 +1,25 @@
+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,159 +1,5 @@
 # Revision history for ghcup
 
-## 0.1.20.0 -- 2023-11-10
-
-### New features
-
-* support TUI on windows thanks to the work from vty and brick maintainers (Chris Hackett, Timofey Zakrevskiy, Jonathan Daugherty, ...), wrt [#912](https://github.com/haskell/ghcup-hs/pull/912)
-* support JS and wasm cross compilers wrt [#838](https://github.com/haskell/ghcup-hs/issues/838), thanks to Sylvain Henry and IOG
-* Support stacks installation strategy and metadata wrt [#892](https://github.com/haskell/ghcup-hs/issues/892)
-  - you can now enable stacks installation method via `ghcup config set url-source '["GHCupURL", "StackSetupURL"]'`... for more information, check the [documentation](https://www.haskell.org/ghcup/guide/#using-stacks-setup-info-metadata-to-install-ghc)
-
-### Improvements and bug fixes
-
-* fix segfault in TUI when hitting enter early wrt [#887](https://github.com/haskell/ghcup-hs/issues/887)
-* Improve key handling in TUI, fixes [#875](https://github.com/haskell/ghcup-hs/issues/875)
-* add explicit support for Void Linux and Rocky Linux (this requires a metadata version bump to `ghcup-0.0.8.yaml`)
-* optparse cli interface now has a test suite thanks to Lei Zhu, wrt [#862](https://github.com/haskell/ghcup-hs/pull/862)
-
-## 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)
-
-## 0.1.18.0 -- 2022-07-30
-
-* Fix tui set wrt [#266](https://gitlab.haskell.org/haskell/ghcup-hs/-/merge_requests/266) by Arjun Kathuria
-    - Ask the user to install the tool via prompt when setting an non-installed version
-* improvements to safe (un-)installations
-    - bindists that don't support `make DESTDIR=/some/tmp/dir install` are now unsupported
-    - installed GHC files are now recorded to avoid use of `removePathForcibly`
-    - internally uses a newtype wrapper for user-input paths and restrict destructive operations to validated paths
-* Add `--disable-ld-override` for darwin bindists wrt #391
-* Allow passing bindist configure args wrt #377
-* use of `TMPDIR` is dropped... now uses an internal tmp dir `~/.ghcup/tmp`
-* improvements to error handling and warnings
-* Require --isolate to have an absolute directory, fixes #367
-* Fix mingw PATH handling wrt #371
-* Add --mingw-path switch to `ghcup run`
-* Fix `ghcup run` on windows, fixes #375
-* Improve `ghcup compile <hls|ghc>`
-    - short hashes now work
-    - print the long hash in addition to the detected version
-* Improve `ghcup compile hls`
-    - add `--git-describe-version` switch as an alternative to `--overwrite-version`
-    - Allow to build HLS from hackage (now is the default)
-	- Allow to run 'cabal update' automatically before the HLS build
-	- Fix parser and completer for 'ghcup compile hls --version'
-* Improve `ghcup compile ghc`
-    - Allow to build from arbitrary GHC source dists
-
-## 0.1.17.10 -- 2022-05-12
-
-* windows hotfix (hackage-only release)
-
-## 0.1.17.9 -- 2022-05-12
-
-* broken sdist (hackage-only release)
-
-## 0.1.17.8 -- 2022-05-11
-
-* Fix a serious (but hard to trigger) bug when combining `--isolate <DIR>` with `--force`, please make sure to upgrade or avoid `--force`
-* Fix HLS build not cleaning up properly on failed installations, fixes [#361](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/361)
-* Fix parsing of symlinks with multiple slashes, wrt [#353](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/353)
-* Re-enable upgrade functionality for all configurations wrt [MR #250](https://gitlab.haskell.org/haskell/ghcup-hs/-/merge_requests/250) and [VSCode haskell issue #601](https://github.com/haskell/vscode-haskell/issues/601)
-* Fix `ghcup run --ghc 8.10` (for short versions) wrt [#360](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/360)
-    - this also introduces a `--quick` switch for `ghcup run`
-
-## 0.1.17.7 -- 2022-04-21
-
-* Fix `ghcup run` on windows wrt [#345](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/345)
-
-## 0.1.17.6 -- 2022-03-18
-
-* Vastly improve shell completions wrt [#242](https://gitlab.haskell.org/haskell/ghcup-hs/-/merge_requests/242)
-* Fix 'ghcup install cabal/hls/stack --set' wrt [#324](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/324)
-* Fix bad error message wrt [#323](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/323)
-* Use predictable /tmp names for `ghcup run`, fixes [#329](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/329)
-* Fix bug with isolated installation of not previously installed versions
-* Add `--no-set` to install commands, fixes [#330](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/330)
-* Fix serious bug in `ghcup list --raw-format -t <tool> -c installed`
-* Overhaul metadata merging and add `ghcup config add-release-channel URI` wrt [#328](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/328)
-* Fix max path issues on windows with `ghcup run`
-
-## 0.1.17.5 -- 2022-02-26
-
-* Implement `ghcup run` subcommand wrt [#137](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/137)
-* Support installation of dynamic HLS bindists wrt [HLS #2675](https://github.com/haskell/haskell-language-server/pull/2675) and [#237](https://gitlab.haskell.org/haskell/ghcup-hs/-/merge_requests/237)
-* Fix XDG support when `~/.local/bin` is a symlink wrt [#311](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/311)
-* Add support for quilt-style patches wrt [#230](https://gitlab.haskell.org/haskell/ghcup-hs/-/merge_requests/230), by James Hobson
-* Fix redundant upgrade warnings in `ghcup upgrade`
-* Fix `ghcup whereis ghc` for non-standard versions wrt [#289](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/289)
-* Don't print logs to stdout, but stderr
-* Allow unpacking legacy lzma archives wrt [#307](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/307)
-* Allow to disable self-upgrade functionality wrt [#305](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/305)
-* Fix `ghcup install ghc --set` when ghc is already installed wrt [#291](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/291)
-
-## 0.1.17.4 -- 2021-11-13
-
-* add `--metadata-caching` option, allowing to also disable yaml metadata caching wrt [#278](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/278)
-* make upgrading ghcup in TUI more pleasant wrt [#276](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/276)
-* fix parsing of atypical GHC versions (e.g. `8.10.5-patch1`)
-* fix compiling HLS dynamically linked, also see [#245](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/245)
-* redo (and break) some of the `ghcup compile <tool>` interface, improving patch options and setting custom cabal.project files
-* avoid redundant update warnings wrt [#283](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/283)
-
-## 0.1.17.3 -- 2021-10-27
-
-* clean up during unpack failures as well
-* migrate te aeson-2.0.1.0
-* switch to yaml-streamly to fix performance regression wrt [#270](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/270)
-* use [github.com/haskell/ghcup-metadata](https://github.com/haskell/ghcup-metadata) for metadata file download (better caching)
-
 ## 0.1.17.2 -- 2021-09-30
 
 * Honour GHC bootstrap compiler during git clone stages wrt [#250](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/250)

README.md

@@ -6,8 +6,6 @@
 [![Join the chat at https://gitter.im/haskell/ghcup](https://badges.gitter.im/haskell/ghcup.svg)](https://gitter.im/haskell/ghcup?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 <a href="https://opencollective.com/ghcup#category-CONTRIBUTE"><img src="https://opencollective.com/webpack/donate/button@2x.png?color=blue" alt="Donate" width="150"></a>
 
-GHCup is the main installer for the general purpose language [Haskell](https://www.haskell.org/).
+GHCup is an installer for the general purpose language [Haskell](https://www.haskell.org/).
 
 Visit the [documentation](https://www.haskell.org/ghcup/) for installation instructions.
-
-If you're looking for the metadata YAML files, see here: [https://github.com/haskell/ghcup-metadata](https://github.com/haskell/ghcup-metadata)

app/ghcup-gen/Main.hs

@@ -0,0 +1,157 @@
+{-# LANGUAGE CPP               #-}
+{-# LANGUAGE DataKinds         #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NamedFieldPuns    #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE TemplateHaskell   #-}
+{-# LANGUAGE TypeApplications  #-}
+
+
+module Main where
+
+import           GHCup.Types
+import           GHCup.Errors
+import           GHCup.Platform
+import           GHCup.Utils.Dirs
+import           GHCup.Utils.Logger
+import           GHCup.Types.JSON               ( )
+
+import           Control.Monad.Trans.Reader     ( runReaderT )
+import           Control.Monad.IO.Class
+import           Data.Char                      ( toLower )
+import           Data.Maybe
+#if !MIN_VERSION_base(4,13,0)
+import           Data.Semigroup                 ( (<>) )
+#endif
+import           Options.Applicative     hiding ( style )
+import           Haskus.Utils.Variant.Excepts
+import           System.Console.Pretty
+import           System.Environment
+import           System.Exit
+import           System.IO                      ( stderr )
+import           Text.Regex.Posix
+import           Validate
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
+
+import qualified Data.Text.IO                  as T
+import qualified Data.Text                     as T
+import qualified Data.ByteString               as B
+import qualified Data.YAML.Aeson               as Y
+
+
+data Options = Options
+  { optCommand :: Command
+  }
+
+data Command = ValidateYAML ValidateYAMLOpts
+             | ValidateTarballs ValidateYAMLOpts TarballFilter
+
+
+data Input
+  = FileInput FilePath -- optsparse-applicative doesn't handle ByteString correctly anyway
+  | StdInput
+
+fileInput :: Parser Input
+fileInput =
+  FileInput
+    <$> strOption
+          (long "file" <> short 'f' <> metavar "FILENAME" <> help
+            "Input file to validate"
+          )
+
+stdInput :: Parser Input
+stdInput = flag'
+  StdInput
+  (short 'i' <> long "stdin" <> help "Validate from stdin (default)")
+
+inputP :: Parser Input
+inputP = fileInput <|> stdInput
+
+data ValidateYAMLOpts = ValidateYAMLOpts
+  { vInput :: Maybe Input
+  }
+
+validateYAMLOpts :: Parser ValidateYAMLOpts
+validateYAMLOpts = ValidateYAMLOpts <$> optional inputP
+
+tarballFilterP :: Parser TarballFilter
+tarballFilterP = option readm $
+  long "tarball-filter" <> short 'u' <> metavar "<tool>-<version>" <> value def
+    <> help "Only check certain tarballs (format: <tool>-<version>)"
+  where
+    def = TarballFilter (Right Nothing) (makeRegex ("" :: String))
+    readm = do
+      s <- str
+      case span (/= '-') s of
+        (_, []) -> fail "invalid format, missing '-' after the tool name"
+        (t, v) | [tool] <- [ tool | tool <- [minBound..maxBound], low (show tool) == low t ] ->
+          pure (TarballFilter $ Right $ Just tool) <*> makeRegexOptsM compIgnoreCase execBlank (drop 1 v)
+        (t, v) | [tool] <- [ tool | tool <- [minBound..maxBound], low (show tool) == low t ] ->
+          pure (TarballFilter $ Left tool) <*> makeRegexOptsM compIgnoreCase execBlank (drop 1 v)
+        _ -> fail "invalid tool"
+    low = fmap toLower
+
+
+opts :: Parser Options
+opts = Options <$> com
+
+com :: Parser Command
+com = subparser
+  (  command
+       "check"
+       (   ValidateYAML
+       <$> info (validateYAMLOpts <**> helper)
+                (progDesc "Validate the YAML")
+       )
+  <> command
+       "check-tarballs"
+       (info
+         ((ValidateTarballs <$> validateYAMLOpts <*> tarballFilterP) <**> helper)
+         (progDesc "Validate all tarballs (download and checksum)")
+       )
+  )
+
+
+
+main :: IO ()
+main = do
+  no_color <- isJust <$> lookupEnv "NO_COLOR"
+  let loggerConfig = LoggerConfig { lcPrintDebug  = True
+                                  , consoleOutter = T.hPutStr stderr
+                                  , fileOutter    = \_ -> pure ()
+                                  , fancyColors   = not no_color
+                                  }
+  dirs <- liftIO getAllDirs
+  let leanAppstate = LeanAppState (Settings True False Never Curl True GHCupURL False GPGNone False) dirs defaultKeyBindings loggerConfig
+
+  pfreq <- (
+    flip runReaderT leanAppstate . runE @'[NoCompatiblePlatform, NoCompatibleArch, DistroNotFound] $ platformRequest
+    ) >>= \case
+            VRight r -> pure r
+            VLeft e -> do
+              flip runReaderT leanAppstate $ logError $ T.pack $ prettyShow e
+              liftIO $ exitWith (ExitFailure 2)
+
+  let appstate = AppState (Settings True False Never Curl True GHCupURL False GPGNone False) dirs defaultKeyBindings (GHCupInfo mempty mempty mempty) pfreq loggerConfig
+
+  _ <- customExecParser (prefs showHelpOnError) (info (opts <**> helper) idm)
+    >>= \Options {..} -> case optCommand of
+          ValidateYAML vopts -> withValidateYamlOpts vopts (\dl m -> flip runReaderT appstate $ validate dl m)
+          ValidateTarballs vopts tarballFilter -> withValidateYamlOpts vopts (\dl m -> flip runReaderT appstate $ validateTarballs tarballFilter dl m)
+  pure ()
+
+ where
+  withValidateYamlOpts vopts f = case vopts of
+    ValidateYAMLOpts { vInput = Nothing } ->
+      B.getContents >>= valAndExit f
+    ValidateYAMLOpts { vInput = Just StdInput } ->
+      B.getContents >>= valAndExit f
+    ValidateYAMLOpts { vInput = Just (FileInput file) } ->
+      B.readFile file >>= valAndExit f
+  valAndExit f contents = do
+    (GHCupInfo _ av gt) <- case Y.decode1Strict contents of
+      Right r -> pure r
+      Left  (_, e) -> die (color Red $ show e)
+    f av gt
+      >>= exitWith

app/ghcup-gen/Validate.hs

@@ -0,0 +1,280 @@
+{-# LANGUAGE CPP              #-}
+{-# LANGUAGE DataKinds        #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE QuasiQuotes      #-}
+{-# LANGUAGE TemplateHaskell  #-}
+{-# LANGUAGE TypeApplications #-}
+{-# LANGUAGE ViewPatterns     #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Validate where
+
+import           GHCup
+import           GHCup.Download
+import           GHCup.Errors
+import           GHCup.Types
+import           GHCup.Types.Optics
+import           GHCup.Utils
+import           GHCup.Utils.Logger
+import           GHCup.Utils.Version.QQ
+
+import           Codec.Archive
+import           Control.Applicative
+import           Control.Exception.Safe
+import           Control.Monad
+import           Control.Monad.IO.Class
+import           Control.Monad.Reader.Class
+import           Control.Monad.Trans.Class      ( lift )
+import           Control.Monad.Trans.Reader     ( runReaderT )
+import           Control.Monad.Trans.Resource   ( runResourceT
+                                                , MonadUnliftIO
+                                                )
+import           Data.Containers.ListUtils      ( nubOrd )
+import           Data.IORef
+import           Data.List
+import           Data.Versions
+import           Haskus.Utils.Variant.Excepts
+import           Optics
+import           System.FilePath
+import           System.Exit
+import           Text.ParserCombinators.ReadP
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
+import           Text.Regex.Posix
+
+import qualified Data.Map.Strict               as M
+import qualified Data.Text                     as T
+import qualified Data.Version                  as V
+
+
+data ValidationError = InternalError String
+  deriving Show
+
+instance Exception ValidationError
+
+
+addError :: (MonadReader (IORef Int) m, MonadIO m, Monad m) => m ()
+addError = do
+  ref <- ask
+  liftIO $ modifyIORef ref (+ 1)
+
+
+validate :: (Monad m, MonadReader env m, HasLog env, MonadThrow m, MonadIO m, MonadUnliftIO m)
+         => GHCupDownloads
+         -> M.Map GlobalTool DownloadInfo
+         -> m ExitCode
+validate dls _ = do
+  ref <- liftIO $ newIORef 0
+
+  -- verify binary downloads --
+  flip runReaderT ref $ do
+    -- unique tags
+    forM_ (M.toList dls) $ \(t, _) -> checkUniqueTags t
+
+    -- required platforms
+    forM_ (M.toList dls) $ \(t, versions) ->
+      forM_ (M.toList versions) $ \(v, vi) ->
+        forM_ (M.toList $ _viArch vi) $ \(arch, pspecs) -> do
+          checkHasRequiredPlatforms t v (_viTags vi) arch (M.keys pspecs)
+
+    checkGHCVerIsValid
+    forM_ (M.toList dls) $ \(t, _) -> checkMandatoryTags t
+    _ <- checkGHCHasBaseVersion
+
+    -- exit
+    e <- liftIO $ readIORef ref
+    if e > 0
+      then pure $ ExitFailure e
+      else do
+        lift $ logInfo "All good"
+        pure ExitSuccess
+ where
+  checkHasRequiredPlatforms t v tags arch pspecs = do
+    let v' = prettyVer v
+        arch' = prettyShow arch
+    when (notElem (Linux UnknownLinux) pspecs) $ do
+      lift $ logError $
+        "Linux UnknownLinux missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
+      addError
+    when ((notElem Darwin pspecs) && arch == A_64) $ do
+      lift $ logError $ "Darwin missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
+      addError
+    when ((notElem FreeBSD pspecs) && arch == A_64) $ lift $ logWarn $
+      "FreeBSD missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
+    when (notElem Windows pspecs && arch == A_64) $ do
+      lift $ logError $ "Windows missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
+      addError
+
+    -- alpine needs to be set explicitly, because
+    -- we cannot assume that "Linux UnknownLinux" runs on Alpine
+    -- (although it could be static)
+    when (notElem (Linux Alpine) pspecs) $
+      case t of
+        GHCup | arch `elem` [A_64, A_32] -> lift (logError $ "Linux Alpine missing for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack (prettyShow arch)) >> addError
+        Cabal | v > [vver|2.4.1.0|]
+              , arch `elem` [A_64, A_32] -> lift (logError $ "Linux Alpine missing for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack (prettyShow arch)) >> addError
+        GHC | Latest `elem` tags || Recommended `elem` tags
+            , arch `elem` [A_64, A_32] -> lift (logError $ "Linux Alpine missing for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack (prettyShow arch))
+        _ -> lift $ logWarn $ "Linux Alpine missing for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack (prettyShow arch)
+
+  checkUniqueTags tool = do
+    let allTags = join $ fmap _viTags $ M.elems $ availableToolVersions dls tool
+    let nonUnique =
+          fmap fst
+            .   filter (\(_, b) -> not b)
+            <$> ( mapM
+                    (\case
+                      [] -> throwM $ InternalError "empty inner list"
+                      (t : ts) ->
+                        pure $ (t, ) (not (isUniqueTag t) || null ts)
+                    )
+                . group
+                . sort
+                $ allTags
+                )
+    case join nonUnique of
+      [] -> pure ()
+      xs -> do
+        lift $ logError $ "Tags not unique for " <> T.pack (prettyShow tool) <> ": " <> T.pack (prettyShow xs)
+        addError
+   where
+    isUniqueTag Latest         = True
+    isUniqueTag Recommended    = True
+    isUniqueTag Old            = False
+    isUniqueTag Prerelease     = False
+    isUniqueTag (Base       _) = False
+    isUniqueTag (UnknownTag _) = False
+
+  checkGHCVerIsValid = do
+    let ghcVers = toListOf (ix GHC % to M.keys % folded) dls
+    forM_ ghcVers $ \v ->
+      case [ x | (x,"") <- readP_to_S V.parseVersion (T.unpack . prettyVer $ v) ] of
+        [_] -> pure ()
+        _   -> do
+          lift $ logError $ "GHC version " <> prettyVer v <> " is not valid"
+          addError
+
+  -- a tool must have at least one of each mandatory tags
+  checkMandatoryTags tool = do
+    let allTags = join $ fmap _viTags $ M.elems $ availableToolVersions dls tool
+    forM_ [Latest, Recommended] $ \t -> case elem t allTags of
+      False -> do
+        lift $ logError $ "Tag " <> T.pack (prettyShow t) <> " missing from " <> T.pack (prettyShow tool)
+        addError
+      True -> pure ()
+
+  -- all GHC versions must have a base tag
+  checkGHCHasBaseVersion = do
+    let allTags = M.toList $ availableToolVersions dls GHC
+    forM allTags $ \(ver, _viTags -> tags) -> case any isBase tags of
+      False -> do
+        lift $ logError $ "Base tag missing from GHC ver " <> prettyVer ver
+        addError
+      True -> pure ()
+
+  isBase (Base _) = True
+  isBase _        = False
+
+data TarballFilter = TarballFilter
+  { tfTool    :: Either GlobalTool (Maybe Tool)
+  , tfVersion :: Regex
+  }
+
+validateTarballs :: ( Monad m
+                    , MonadReader env m
+                    , HasLog env
+                    , HasDirs env
+                    , HasSettings env
+                    , MonadThrow m
+                    , MonadIO m
+                    , MonadUnliftIO m
+                    , MonadMask m
+                    , Alternative m
+                    , MonadFail m
+                    )
+                 => TarballFilter
+                 -> GHCupDownloads
+                 -> M.Map GlobalTool DownloadInfo
+                 -> m ExitCode
+validateTarballs (TarballFilter etool versionRegex) dls gt = do
+  ref <- liftIO $ newIORef 0
+
+   -- download/verify all tarballs
+  let dlis = either (const []) (\tool -> nubOrd $ dls ^.. each %& indices (maybe (const True) (==) tool) %> each %& indices (matchTest versionRegex . T.unpack . prettyVer) % (viSourceDL % _Just `summing` viArch % each % each % each)) etool
+  let gdlis = nubOrd $ gt ^.. each
+  let allDls = either (const gdlis) (const dlis) etool
+  when (null allDls) $ logError "no tarballs selected by filter" *> (flip runReaderT ref addError)
+  forM_ allDls (downloadAll ref)
+
+  -- exit
+  e <- liftIO $ readIORef ref
+  if e > 0
+    then pure $ ExitFailure e
+    else do
+      logInfo "All good"
+      pure ExitSuccess
+
+ where
+  downloadAll :: ( MonadUnliftIO m
+                 , MonadIO m
+                 , MonadReader env m
+                 , HasLog env
+                 , HasDirs env
+                 , HasSettings env
+                 , MonadCatch m
+                 , MonadMask m
+                 , MonadThrow m
+                 )
+              => IORef Int
+              -> DownloadInfo
+              -> m ()
+  downloadAll ref dli = do
+    r <- runResourceT
+      . runE @'[DigestError
+               , GPGError
+               , DownloadFailed
+               , UnknownArchive
+               , ArchiveResult
+               ]
+      $ do
+        case etool of
+          Right (Just GHCup) -> do
+            tmpUnpack <- lift mkGhcupTmpDir
+            _ <- liftE $ download (_dlUri dli) Nothing (Just (_dlHash dli)) tmpUnpack Nothing False
+            pure Nothing
+          Right _ -> do
+            p <- liftE $ downloadCached dli Nothing
+            fmap (Just . head . splitDirectories . head)
+              . liftE
+              . getArchiveFiles
+              $ p
+          Left ShimGen -> do
+            tmpUnpack <- lift mkGhcupTmpDir
+            _ <- liftE $ download (_dlUri dli) Nothing (Just (_dlHash dli)) tmpUnpack Nothing False
+            pure Nothing
+    case r of
+      VRight (Just basePath) -> do
+        case _dlSubdir dli of
+          Just (RealDir prel) -> do
+            logInfo
+              $ " verifying subdir: " <> T.pack prel
+            when (basePath /= prel) $ do
+              logError $
+                "Subdir doesn't match: expected " <> T.pack prel <> ", got " <> T.pack basePath
+              (flip runReaderT ref addError)
+          Just (RegexDir regexString) -> do
+            logInfo $
+              "verifying subdir (regex): " <> T.pack regexString
+            let regex = makeRegexOpts
+                  compIgnoreCase
+                  execBlank
+                  regexString
+            when (not (match regex basePath)) $ do
+              logError $
+                "Subdir doesn't match: expected regex " <> T.pack regexString <> ", got " <> T.pack basePath
+              (flip runReaderT ref addError)
+          Nothing -> pure ()
+      VRight Nothing -> pure ()
+      VLeft  e -> do
+        logError $
+          "Could not download (or verify hash) of " <> T.pack (show dli) <> ", Error was: " <> T.pack (prettyShow e)
+        (flip runReaderT ref addError)

app/ghcup/GHCup/OptParse.hs

@@ -1,14 +1,17 @@
 {-# LANGUAGE CPP               #-}
 {-# LANGUAGE DataKinds         #-}
+{-# LANGUAGE TypeApplications  #-}
 {-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell   #-}
+{-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 
 
 module GHCup.OptParse (
     module GHCup.OptParse.Common
   , module GHCup.OptParse.Install
-  , module GHCup.OptParse.Test
   , module GHCup.OptParse.Set
   , module GHCup.OptParse.UnSet
   , module GHCup.OptParse.Rm
@@ -16,34 +19,27 @@ module GHCup.OptParse (
   , module GHCup.OptParse.Config
   , module GHCup.OptParse.Whereis
   , module GHCup.OptParse.List
-#ifndef DISABLE_UPGRADE
   , module GHCup.OptParse.Upgrade
-#endif
   , module GHCup.OptParse.ChangeLog
   , module GHCup.OptParse.Prefetch
   , module GHCup.OptParse.GC
   , module GHCup.OptParse.DInfo
   , module GHCup.OptParse.Nuke
   , module GHCup.OptParse.ToolRequirements
-  , module GHCup.OptParse.Run
   , module GHCup.OptParse
 ) where
 
 
 import           GHCup.OptParse.Common
 import           GHCup.OptParse.Install
-import           GHCup.OptParse.Test
 import           GHCup.OptParse.Set
 import           GHCup.OptParse.UnSet
 import           GHCup.OptParse.Rm
-import           GHCup.OptParse.Run
 import           GHCup.OptParse.Compile
 import           GHCup.OptParse.Config
 import           GHCup.OptParse.Whereis
 import           GHCup.OptParse.List
-#ifndef DISABLE_UPGRADE
 import           GHCup.OptParse.Upgrade
-#endif
 import           GHCup.OptParse.ChangeLog
 import           GHCup.OptParse.Prefetch
 import           GHCup.OptParse.GC
@@ -57,12 +53,16 @@ import           GHCup.Types
 import           Control.Monad.Fail             ( MonadFail )
 #endif
 import           Control.Monad.Reader
+import           Data.Bifunctor
 import           Data.Either
 import           Data.Functor
 import           Data.Maybe
 import           Options.Applicative     hiding ( style )
 import           Options.Applicative.Help.Pretty ( text )
 import           Prelude                 hiding ( appendFile )
+import           URI.ByteString
+
+import qualified Data.ByteString.UTF8          as UTF8
 
 
 
@@ -71,23 +71,18 @@ data Options = Options
   -- global options
     optVerbose     :: Maybe Bool
   , optCache       :: Maybe Bool
-  , optMetaCache   :: Maybe Integer
-  , optMetaMode    :: Maybe MetaMode
-  , optPlatform    :: Maybe PlatformRequest
-  , optUrlSource   :: Maybe URLSource
+  , optUrlSource   :: Maybe URI
   , optNoVerify    :: Maybe Bool
   , optKeepDirs    :: Maybe KeepDirs
   , optsDownloader :: Maybe Downloader
   , optNoNetwork   :: Maybe Bool
   , optGpg         :: Maybe GPGSetting
-  , optStackSetup  :: Maybe Bool
   -- commands
   , optCommand     :: Command
   }
 
 data Command
   = Install (Either InstallCommand InstallOptions)
-  | Test TestCommand
   | InstallCabalLegacy InstallOptions
   | Set (Either SetCommand SetOptions)
   | UnSet UnsetCommand
@@ -97,10 +92,8 @@ data Command
   | Compile CompileCommand
   | Config ConfigCommand
   | Whereis WhereisOptions WhereisCommand
-#ifndef DISABLE_UPGRADE
-  | Upgrade UpgradeOpts Bool Bool
-#endif
-  | ToolRequirements ToolReqOpts
+  | Upgrade UpgradeOpts Bool
+  | ToolRequirements
   | ChangeLog ChangeLogOptions
   | Nuke
 #if defined(BRICK)
@@ -108,40 +101,26 @@ data Command
 #endif
   | Prefetch PrefetchCommand
   | GC GCOptions
-  | Run RunOptions
-  | PrintAppErrors
 
 
 
 opts :: Parser Options
 opts =
   Options
-    <$> invertableSwitch "verbose" (Just 'v') False (help "Enable verbosity (default: disabled)")
-    <*> invertableSwitch "cache" (Just 'c') False (help "Cache downloads in ~/.ghcup/cache (default: disabled)")
-    <*> optional (option auto (long "metadata-caching" <> metavar "SEC" <> help "How long the yaml metadata caching interval is (in seconds), 0 to disable"))
-    <*> optional (option auto (long "metadata-fetching-mode" <> metavar "<Strict|Lax>" <> help "Whether to fail on metadata download failure (Strict) or fall back to cached version (Lax (default))"))
-    <*> optional
-      (option
-        (eitherReader platformParser)
-        (  short 'p'
-        <> long "platform"
-        <> metavar "PLATFORM"
-        <> help
-             "Override for platform (triple matching ghc tarball names), e.g. x86_64-fedora27-linux"
-        )
-      )
-    <*> optional
+    <$> invertableSwitch "verbose" 'v' False (help "Enable verbosity (default: disabled)")
+    <*> invertableSwitch "cache" 'c' False (help "Cache downloads in ~/.ghcup/cache (default: disabled)")
+    <*> (optional
           (option
-            (eitherReader parseUrlSource)
+            (eitherReader parseUri)
             (  short 's'
             <> long "url-source"
-            <> metavar "URL_SOURCE"
-            <> help "Alternative ghcup download info"
+            <> metavar "URL"
+            <> help "Alternative ghcup download info url"
             <> internal
-            <> completer urlSourceCompleter
             )
           )
-    <*> (fmap . fmap) not (invertableSwitch "verify" (Just 'n') True (help "Disable tarball checksum verification (default: enabled)"))
+        )
+    <*> (fmap . fmap) not (invertableSwitch "verify" 'n' True (help "Disable tarball checksum verification (default: enabled)"))
     <*> optional (option
           (eitherReader keepOnParser)
           (  long "keep"
@@ -149,7 +128,6 @@ opts =
           <> help
                "Keep build directories? (default: errors)"
           <> hidden
-          <> completer (listCompleter ["always", "errors", "never"])
           ))
     <*> optional (option
           (eitherReader downloaderParser)
@@ -158,27 +136,25 @@ opts =
           <> metavar "<internal|curl|wget>"
           <> help
           "Downloader to use (default: internal)"
-          <> completer (listCompleter ["internal", "curl", "wget"])
 #else
           <> metavar "<curl|wget>"
           <> help
           "Downloader to use (default: curl)"
-          <> completer (listCompleter ["curl", "wget"])
 #endif
           <> hidden
           ))
-    <*> invertableSwitch "offline" (Just 'o') False (help "Don't do any network calls, trying cached assets and failing if missing.")
+    <*> invertableSwitch "offline" 'o' False (help "Don't do any network calls, trying cached assets and failing if missing.")
     <*> optional (option
           (eitherReader gpgParser)
           (  long "gpg"
           <> metavar "<strict|lax|none>"
           <> help
           "GPG verification (default: none)"
-          <> completer (listCompleter ["strict", "lax", "none"])
           ))
-    <*> invertableSwitch "stack-setup" (Just 's') False (help "Use stack's setup info for discovering and installing GHC versions")
     <*> com
-
+ where
+  parseUri s' =
+    first show $ parseURI strictURIParserOptions (UTF8.fromString s')
 
 
 com :: Parser Command
@@ -188,10 +164,11 @@ com =
       (  command
           "tui"
           (   (\_ -> Interactive)
-          <$> info
+          <$> (info
                 helper
                 (  progDesc "Start the interactive GHCup UI"
                 )
+              )
           )
       <>  command
 #else
@@ -205,14 +182,6 @@ com =
                 <> footerDoc (Just $ text installToolFooter)
                 )
           )
-      <> command
-           "test"
-           (info
-             (Test <$> testParser <**> helper)
-             (  progDesc "Run tests for a tool (if any) [EXPERIMENTAL!]"
-             <> footerDoc (Just $ text testFooter)
-             )
-           )
       <> command
            "set"
            (info
@@ -241,16 +210,13 @@ com =
       <> command
            "list"
            (info (List <$> listOpts <**> helper)
-                 (progDesc "Show available GHCs and other tools"
-                 <> footerDoc (Just $ text listToolFooter))
+                 (progDesc "Show available GHCs and other tools")
            )
       <> command
            "upgrade"
            (info
              (    (Upgrade <$> upgradeOptsP <*> switch
                     (short 'f' <> long "force" <> help "Force update")
-                    <*> switch
-                    (long "fail-if-shadowed" <> help "Fails after upgrading if the upgraded ghcup binary is shadowed by something else in PATH (useful for CI)")
                   )
              <**> helper
              )
@@ -293,16 +259,6 @@ com =
              (progDesc "Garbage collection"
              <> footerDoc ( Just $ text gcFooter ))
            )
-      <> command
-              "run"
-               (Run
-               <$>
-                 info
-                   (runOpts <**> helper)
-                   (progDesc "Run a command with the given tool in PATH"
-                   <> footerDoc ( Just $ text runFooter )
-                   )
-               )
       <> commandGroup "Main commands:"
       )
     <|> subparser
@@ -311,8 +267,8 @@ com =
               ((\_ -> DInfo) <$> info helper (progDesc "Show debug info"))
           <> command
                "tool-requirements"
-               (   ToolRequirements
-               <$> info (toolReqP <**> helper)
+               (   (\_ -> ToolRequirements)
+               <$> info helper
                         (progDesc "Show the requirements for ghc/cabal")
                )
           <> command
@@ -351,10 +307,3 @@ com =
            <> commandGroup "Nuclear Commands:"
            <> hidden
           )
-     <|> subparser
-          (command
-              "print-app-errors"
-               (info (pure PrintAppErrors <**> helper)
-                     (progDesc ""))
-           <> internal
-          )

app/ghcup/GHCup/OptParse/ChangeLog.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE TypeApplications  #-}
 {-# LANGUAGE FlexibleContexts  #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE QuasiQuotes       #-}
 {-# LANGUAGE OverloadedStrings #-}
@@ -12,12 +13,9 @@ module GHCup.OptParse.ChangeLog where
 
 
 import           GHCup.Types
-import           GHCup.Errors
+import           GHCup.Utils.Logger
 import           GHCup.OptParse.Common
-import           GHCup.Prelude
-import           GHCup.Prelude.Logger
-import           GHCup.Prelude.String.QQ
-import           GHCup.Prelude.Process (exec)
+import           GHCup.Utils.String.QQ
 
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -29,14 +27,16 @@ import           Data.Maybe
 import           Options.Applicative     hiding ( style )
 import           Prelude                 hiding ( appendFile )
 import           System.Exit
-import           System.Process                 ( system )
 import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 
 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 GHCup.Utils.Prelude
+import GHCup.Utils.File (exec)
 import Data.Char (toLower)
 
 
@@ -50,7 +50,7 @@ data ChangeLogOptions = ChangeLogOptions
   { clOpen    :: Bool
   , clTool    :: Maybe Tool
   , clToolVer :: Maybe ToolVersion
-  } deriving (Eq, Show)
+  }
 
 
 
@@ -59,7 +59,7 @@ data ChangeLogOptions = ChangeLogOptions
     --[ Parsers ]--
     ---------------
 
-
+          
 changelogP :: Parser ChangeLogOptions
 changelogP =
   (\x y -> ChangeLogOptions x y)
@@ -72,16 +72,14 @@ changelogP =
                 "cabal" -> Right Cabal
                 "ghcup" -> Right GHCup
                 "stack" -> Right Stack
-                "hls"   -> Right HLS
                 e       -> Left e
               )
             )
-            (short 't' <> long "tool" <> metavar "<ghc|cabal|hls|ghcup|stack>" <> help
+            (short 't' <> long "tool" <> metavar "<ghc|cabal|ghcup>" <> help
               "Open changelog for given tool (default: ghc)"
-              <> completer toolCompleter
             )
           )
-    <*> optional (toolVersionTagArgument [] Nothing)
+    <*> optional (toolVersionArgument Nothing Nothing)
 
 
 
@@ -115,36 +113,39 @@ changelog :: ( Monad m
 changelog ChangeLogOptions{..} runAppState runLogger = do
   GHCupInfo { _ghcupDownloads = dls } <- runAppState getGHCupInfo
   let tool = fromMaybe GHC clTool
-      ver' = fromMaybe
-        (ToolTag Latest)
+      ver' = maybe
+        (Right Latest)
+        (\case
+          ToolVersion tv -> Left (_tvVersion tv) -- FIXME: ugly sharing of ToolVersion
+          ToolTag     t  -> Right t
+        )
         clToolVer
       muri = getChangeLog dls tool ver'
   case muri of
     Nothing -> do
       runLogger
         (logWarn $
-          "Could not find ChangeLog for " <> T.pack (prettyShow tool) <> ", version " <> T.pack (prettyShow ver')
+          "Could not find ChangeLog for " <> T.pack (prettyShow tool) <> ", version " <> either prettyVer (T.pack . show) ver'
         )
       pure ExitSuccess
     Just uri -> do
       pfreq <- runAppState getPlatformReq
       let uri' = T.unpack . decUTF8Safe . serializeURIRef' $ uri
+          cmd = case _rPlatform pfreq of
+                  Darwin  -> "open"
+                  Linux _ -> "xdg-open"
+                  FreeBSD -> "xdg-open"
+                  Windows -> "start"
+
       if clOpen
         then do
           runAppState $
-            case _rPlatform pfreq of
-              Darwin  -> exec "open" [T.unpack $ decUTF8Safe $ serializeURIRef' uri] Nothing Nothing
-              Linux _ -> exec "xdg-open" [T.unpack $ decUTF8Safe $ serializeURIRef' uri] Nothing Nothing
-              FreeBSD -> exec "xdg-open" [T.unpack $ decUTF8Safe $ serializeURIRef' uri] Nothing Nothing
-              Windows -> do
-                let args = "start \"\" " ++ (T.unpack $ decUTF8Safe $ serializeURIRef' uri)
-                c <- liftIO $ system $ args
-                case c of
-                   (ExitFailure xi) -> pure $ Left $ NonZeroExit xi "cmd.exe" [args]
-                   ExitSuccess -> pure $ Right ()
+            exec cmd
+                 [T.unpack $ decUTF8Safe $ serializeURIRef' uri]
+                 Nothing
+                 Nothing
               >>= \case
                     Right _ -> pure ExitSuccess
-                    Left  e -> logError (T.pack $ prettyHFError e)
+                    Left  e -> logError (T.pack $ prettyShow e)
                       >> pure (ExitFailure 13)
         else liftIO $ putStrLn uri' >> pure ExitSuccess
-

app/ghcup/GHCup/OptParse/Common.hs

@@ -0,0 +1,520 @@
+{-# LANGUAGE CPP               #-}
+{-# LANGUAGE DataKinds         #-}
+{-# LANGUAGE TypeApplications  #-}
+{-# LANGUAGE FlexibleContexts  #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell   #-}
+{-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+
+module GHCup.OptParse.Common where
+
+
+import           GHCup
+import           GHCup.Download
+import           GHCup.Errors
+import           GHCup.Platform
+import           GHCup.Types
+import           GHCup.Types.Optics
+import           GHCup.Utils
+import           GHCup.Utils.Logger
+import           GHCup.Utils.MegaParsec
+import           GHCup.Utils.Prelude
+
+import           Control.Exception.Safe
+#if !MIN_VERSION_base(4,13,0)
+import           Control.Monad.Fail             ( MonadFail )
+#endif
+import           Control.Monad.Reader
+import           Data.Bifunctor
+import           Data.Char
+import           Data.Either
+import           Data.Functor
+import           Data.List                      ( nub, sort, sortBy )
+import           Data.Maybe
+import           Data.Text                      ( Text )
+import           Data.Versions           hiding ( str )
+import           Data.Void
+import           Haskus.Utils.Variant.Excepts
+import           Options.Applicative     hiding ( style )
+import           Prelude                 hiding ( appendFile )
+import           Safe
+import           System.FilePath
+import           URI.ByteString
+
+import qualified Data.ByteString.UTF8          as UTF8
+import qualified Data.Map.Strict               as M
+import qualified Data.Text                     as T
+import qualified Text.Megaparsec               as MP
+import GHCup.Version
+
+
+    -------------
+    --[ Types ]--
+    -------------
+
+data ToolVersion = ToolVersion GHCTargetVersion -- target is ignored for cabal
+                 | ToolTag Tag
+
+-- a superset of ToolVersion
+data SetToolVersion = SetToolVersion GHCTargetVersion
+                    | SetToolTag Tag
+                    | SetRecommended
+                    | SetNext
+
+prettyToolVer :: ToolVersion -> String
+prettyToolVer (ToolVersion v') = T.unpack $ tVerToText v'
+prettyToolVer (ToolTag t) = show t
+
+toSetToolVer :: Maybe ToolVersion -> SetToolVersion
+toSetToolVer (Just (ToolVersion v')) = SetToolVersion v'
+toSetToolVer (Just (ToolTag t')) = SetToolTag t'
+toSetToolVer Nothing = SetRecommended
+
+
+
+
+    --------------
+    --[ Parser ]--
+    --------------
+
+
+-- | same as toolVersionParser, except as an argument.
+toolVersionArgument :: Maybe ListCriteria -> Maybe Tool -> Parser ToolVersion
+toolVersionArgument criteria tool =
+  argument (eitherReader toolVersionEither)
+    (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"
+
+
+versionParser :: Parser GHCTargetVersion
+versionParser = option
+  (eitherReader tVersionEither)
+  (short 'v' <> long "version" <> metavar "VERSION" <> help "The target version"
+  )
+
+versionParser' :: Maybe ListCriteria -> Maybe Tool -> Parser Version
+versionParser' criteria tool = argument
+  (eitherReader (first show . version . T.pack))
+  (metavar "VERSION"  <> foldMap (completer . versionCompleter criteria) tool)
+
+versionArgument :: Maybe ListCriteria -> Maybe Tool -> Parser GHCTargetVersion
+versionArgument criteria tool = argument (eitherReader tVersionEither) (metavar "VERSION" <> foldMap (completer . versionCompleter criteria) tool)
+
+
+-- https://github.com/pcapriotti/optparse-applicative/issues/148
+
+-- | A switch that can be enabled using --foo and disabled using --no-foo.
+--
+-- The option modifier is applied to only the option that is *not* enabled
+-- by default. For example:
+--
+-- > invertableSwitch "recursive" True (help "do not recurse into directories")
+--
+-- This example makes --recursive enabled by default, so
+-- the help is shown only for --no-recursive.
+invertableSwitch
+    :: String              -- ^ long option
+    -> Char                -- ^ short option for the non-default option
+    -> Bool                -- ^ is switch enabled by default?
+    -> Mod FlagFields Bool -- ^ option modifier
+    -> Parser (Maybe Bool)
+invertableSwitch longopt shortopt defv optmod = invertableSwitch' longopt shortopt defv
+    (if defv then mempty else optmod)
+    (if defv then optmod else mempty)
+
+-- | Allows providing option modifiers for both --foo and --no-foo.
+invertableSwitch'
+    :: String              -- ^ long option (eg "foo")
+    -> Char                -- ^ short option for the non-default option
+    -> Bool                -- ^ is switch enabled by default?
+    -> Mod FlagFields Bool -- ^ option modifier for --foo
+    -> Mod FlagFields Bool -- ^ option modifier for --no-foo
+    -> Parser (Maybe Bool)
+invertableSwitch' longopt shortopt defv enmod dismod = optional
+    ( flag' True ( enmod <> long longopt <> if defv then mempty else short shortopt)
+    <|> flag' False (dismod <> long nolongopt <> if defv then short shortopt else mempty)
+    )
+  where
+    nolongopt = "no-" ++ longopt
+
+
+
+    ---------------------
+    --[ Either Parser ]--
+    ---------------------
+
+
+platformParser :: String -> Either String PlatformRequest
+platformParser s' = case MP.parse (platformP <* MP.eof) "" (T.pack s') of
+  Right r -> pure r
+  Left  e -> Left $ errorBundlePretty e
+ where
+  archP :: MP.Parsec Void Text Architecture
+  archP = MP.try (MP.chunk "x86_64" $> A_64) <|> (MP.chunk "i386" $> A_32)
+  platformP :: MP.Parsec Void Text PlatformRequest
+  platformP = choice'
+    [ (\a mv -> PlatformRequest a FreeBSD mv)
+    <$> (archP <* MP.chunk "-")
+    <*> (  MP.chunk "portbld"
+        *> (   MP.try (Just <$> verP (MP.chunk "-freebsd" <* MP.eof))
+           <|> pure Nothing
+           )
+        <* MP.chunk "-freebsd"
+        )
+    , (\a mv -> PlatformRequest a Darwin mv)
+    <$> (archP <* MP.chunk "-")
+    <*> (  MP.chunk "apple"
+        *> (   MP.try (Just <$> verP (MP.chunk "-darwin" <* MP.eof))
+           <|> pure Nothing
+           )
+        <* MP.chunk "-darwin"
+        )
+    , (\a d mv -> PlatformRequest a (Linux d) mv)
+    <$> (archP <* MP.chunk "-")
+    <*> distroP
+    <*> ((MP.try (Just <$> verP (MP.chunk "-linux" <* MP.eof)) <|> pure Nothing
+         )
+        <* MP.chunk "-linux"
+        )
+    ]
+  distroP :: MP.Parsec Void Text LinuxDistro
+  distroP = choice'
+    [ MP.chunk "debian" $> Debian
+    , MP.chunk "deb" $> Debian
+    , MP.chunk "ubuntu" $> Ubuntu
+    , MP.chunk "mint" $> Mint
+    , MP.chunk "fedora" $> Fedora
+    , MP.chunk "centos" $> CentOS
+    , MP.chunk "redhat" $> RedHat
+    , MP.chunk "alpine" $> Alpine
+    , MP.chunk "gentoo" $> Gentoo
+    , MP.chunk "exherbo" $> Exherbo
+    , MP.chunk "unknown" $> UnknownLinux
+    ]
+
+
+bindistParser :: String -> Either String URI
+bindistParser = first show . parseURI strictURIParserOptions . UTF8.fromString
+
+
+absolutePathParser :: FilePath -> Either String FilePath
+absolutePathParser f = case isValid f && isAbsolute f of
+              True -> Right $ normalise f
+              False -> Left "Please enter a valid absolute filepath."
+
+isolateParser :: FilePath -> Either String FilePath
+isolateParser f = case isValid f of
+              True -> Right $ normalise f
+              False -> Left "Please enter a valid filepath for isolate dir."
+
+toolVersionEither :: String -> Either String ToolVersion
+toolVersionEither s' =
+  second ToolTag (tagEither s') <|> second ToolVersion (tVersionEither s')
+
+tagEither :: String -> Either String Tag
+tagEither s' = case fmap toLower s' of
+  "recommended" -> Right Recommended
+  "latest"      -> Right Latest
+  ('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
+
+
+tVersionEither :: String -> Either String GHCTargetVersion
+tVersionEither =
+  first (const "Not a valid version") . MP.parse ghcTargetVerP "" . T.pack
+
+
+toolParser :: String -> Either String Tool
+toolParser s' | t == T.pack "ghc"   = Right GHC
+              | t == T.pack "cabal" = Right Cabal
+              | t == T.pack "hls"   = Right HLS
+              | t == T.pack "stack" = Right Stack
+              | otherwise           = Left ("Unknown tool: " <> s')
+  where t = T.toLower (T.pack 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')
+  where t = T.toLower (T.pack s')
+
+
+toolVersionParser :: Parser ToolVersion
+toolVersionParser = verP' <|> toolP
+ where
+  verP' = ToolVersion <$> versionParser
+  toolP =
+    ToolTag
+      <$> option
+            (eitherReader tagEither)
+            (short 't' <> long "tag" <> metavar "TAG" <> help "The target tag")
+
+
+
+
+keepOnParser :: String -> Either String KeepDirs
+keepOnParser s' | t == T.pack "always" = Right Always
+                | t == T.pack "errors" = Right Errors
+                | t == T.pack "never"  = Right Never
+                | otherwise            = Left ("Unknown keep value: " <> s')
+  where t = T.toLower (T.pack s')
+
+
+downloaderParser :: String -> Either String Downloader
+downloaderParser s' | t == T.pack "curl"     = Right Curl
+                    | t == T.pack "wget"     = Right Wget
+#if defined(INTERNAL_DOWNLOADER)
+                    | t == T.pack "internal" = Right Internal
+#endif
+                    | otherwise = Left ("Unknown downloader value: " <> s')
+  where t = T.toLower (T.pack s')
+
+gpgParser :: String -> Either String GPGSetting
+gpgParser s' | t == T.pack "strict" = Right GPGStrict
+             | t == T.pack "lax"    = Right GPGLax
+             | t == T.pack "none"   = Right GPGNone
+             | otherwise = Left ("Unknown gpg setting value: " <> s')
+  where t = T.toLower (T.pack s')
+
+
+
+    ------------------
+    --[ Completers ]--
+    ------------------
+
+tagCompleter :: Tool -> [String] -> Completer
+tagCompleter tool add = listIOCompleter $ do
+  dirs' <- liftIO getAllDirs
+  let loggerConfig = LoggerConfig
+        { lcPrintDebug   = False
+        , consoleOutter  = mempty
+        , fileOutter     = mempty
+        , fancyColors    = False
+        }
+  let appState = LeanAppState
+        (Settings True False Never Curl False GHCupURL True GPGNone False)
+        dirs'
+        defaultKeyBindings
+        loggerConfig
+
+  mGhcUpInfo <- flip runReaderT appState . runE $ getDownloadsF
+  case mGhcUpInfo of
+    VRight ghcupInfo -> do
+      let allTags = filter (\t -> t /= Old)
+            $ join
+            $ fmap _viTags
+            $ M.elems
+            $ availableToolVersions (_ghcupDownloads ghcupInfo) tool
+      pure $ nub $ (add ++) $ fmap tagToString allTags
+    VLeft _ -> pure  (nub $ ["recommended", "latest"] ++ add)
+
+
+versionCompleter :: Maybe ListCriteria -> Tool -> Completer
+versionCompleter criteria tool = listIOCompleter $ do
+  dirs' <- liftIO getAllDirs
+  let loggerConfig = LoggerConfig
+        { lcPrintDebug   = False
+        , consoleOutter  = mempty
+        , fileOutter     = mempty
+        , fancyColors    = False
+        }
+  let settings = Settings True False Never Curl False GHCupURL True GPGNone False
+  let leanAppState = LeanAppState
+                   settings
+                   dirs'
+                   defaultKeyBindings
+                   loggerConfig
+  mpFreq <- flip runReaderT leanAppState . runE $ platformRequest
+  mGhcUpInfo <- flip runReaderT leanAppState . runE $ getDownloadsF
+  forFold mpFreq $ \pfreq -> do
+    forFold mGhcUpInfo $ \ghcupInfo -> do
+      let appState = AppState
+            settings
+            dirs'
+            defaultKeyBindings
+            ghcupInfo
+            pfreq
+            loggerConfig
+
+          runEnv = flip runReaderT appState
+
+      installedVersions <- runEnv $ listVersions (Just tool) criteria
+      return $ T.unpack . prettyVer . lVer <$> installedVersions
+
+
+
+
+    -----------------
+    --[ Utilities ]--
+    -----------------
+
+
+fromVersion :: ( HasLog env
+               , MonadFail m
+               , MonadReader env m
+               , HasGHCupInfo env
+               , HasDirs env
+               , MonadThrow m
+               , MonadIO m
+               , MonadCatch m
+               )
+            => Maybe ToolVersion
+            -> Tool
+            -> Excepts
+                 '[ TagNotFound
+                  , NextVerNotFound
+                  , NoToolVersionSet
+                  ] m (GHCTargetVersion, Maybe VersionInfo)
+fromVersion tv = fromVersion' (toSetToolVer tv)
+
+fromVersion' :: ( HasLog env
+                , MonadFail m
+                , MonadReader env m
+                , HasGHCupInfo env
+                , HasDirs env
+                , MonadThrow m
+                , MonadIO m
+                , MonadCatch m
+                )
+             => SetToolVersion
+             -> Tool
+             -> Excepts
+                  '[ TagNotFound
+                   , NextVerNotFound
+                   , NoToolVersionSet
+                   ] m (GHCTargetVersion, Maybe VersionInfo)
+fromVersion' SetRecommended tool = do
+  GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
+  (\(x, y) -> (mkTVer x, Just y)) <$> getRecommended dls tool
+    ?? TagNotFound Recommended tool
+fromVersion' (SetToolVersion v) tool = do
+  GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
+  let vi = getVersionInfo (_tvVersion 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
+          v' <- lift $ pvpToVersion pvp_
+          when (v' /= (_tvVersion v)) $ lift $ logWarn ("Assuming you meant version " <> prettyVer v')
+          pure (GHCTargetVersion (_tvTarget v) v', Just vi')
+        Nothing -> pure (v, vi)
+fromVersion' (SetToolTag Latest) tool = do
+  GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
+  (\(x, y) -> (mkTVer x, Just y)) <$> getLatest dls tool ?? TagNotFound Latest tool
+fromVersion' (SetToolTag Recommended) tool = do
+  GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
+  (\(x, y) -> (mkTVer x, Just y)) <$> getRecommended dls tool ?? TagNotFound Recommended tool
+fromVersion' (SetToolTag (Base pvp'')) GHC = do
+  GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
+  (\(x, y) -> (mkTVer x, Just y)) <$> getLatestBaseVersion dls pvp'' ?? TagNotFound (Base pvp'') GHC
+fromVersion' SetNext tool = do
+  GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
+  next <- case tool of
+    GHC -> do
+      set <- fmap _tvVersion $ ghcSet Nothing !? NoToolVersionSet tool
+      ghcs <- rights <$> lift getInstalledGHCs
+      (headMay
+        . tail
+        . dropWhile (\GHCTargetVersion {..} -> _tvVersion /= set)
+        . cycle
+        . sortBy (\x y -> compare (_tvVersion x) (_tvVersion y))
+        . filter (\GHCTargetVersion {..} -> _tvTarget == Nothing)
+        $ ghcs) ?? NoToolVersionSet tool
+    Cabal -> do
+      set <- cabalSet !? NoToolVersionSet tool
+      cabals <- rights <$> lift getInstalledCabals
+      (fmap (GHCTargetVersion Nothing)
+        . headMay
+        . tail
+        . dropWhile (/= set)
+        . cycle
+        . sort
+        $ cabals) ?? NoToolVersionSet tool
+    HLS -> do
+      set <- hlsSet !? NoToolVersionSet tool
+      hlses <- rights <$> lift getInstalledHLSs
+      (fmap (GHCTargetVersion Nothing)
+        . headMay
+        . tail
+        . dropWhile (/= set)
+        . cycle
+        . sort
+        $ hlses) ?? NoToolVersionSet tool
+    Stack -> do
+      set <- stackSet !? NoToolVersionSet tool
+      stacks <- rights <$> lift getInstalledStacks
+      (fmap (GHCTargetVersion Nothing)
+        . headMay
+        . tail
+        . dropWhile (/= set)
+        . cycle
+        . sort
+        $ stacks) ?? NoToolVersionSet tool
+    GHCup -> fail "GHCup cannot be set"
+  let vi = getVersionInfo (_tvVersion next) tool dls
+  pure (next, vi)
+fromVersion' (SetToolTag t') tool =
+  throwE $ TagNotFound t' tool
+
+
+checkForUpdates :: ( MonadReader env m
+                   , HasGHCupInfo env
+                   , HasDirs env
+                   , HasPlatformReq env
+                   , MonadCatch m
+                   , HasLog env
+                   , MonadThrow m
+                   , MonadIO m
+                   , MonadFail m
+                   )
+                => m ()
+checkForUpdates = do
+  GHCupInfo { _ghcupDownloads = dls } <- getGHCupInfo
+  lInstalled <- listVersions Nothing (Just ListInstalled)
+  let latestInstalled tool = (fmap lVer . lastMay . filter (\lr -> lTool lr == tool)) lInstalled
+
+  forM_ (getLatest dls GHCup) $ \(l, _) -> do
+    (Right ghc_ver) <- pure $ version $ prettyPVP ghcUpVer
+    when (l > ghc_ver)
+      $ logWarn $
+          "New GHCup version available: " <> prettyVer l <> ". To upgrade, run 'ghcup upgrade'"
+
+  forM_ (getLatest dls GHC) $ \(l, _) -> do
+    let mghc_ver = latestInstalled GHC
+    forM mghc_ver $ \ghc_ver ->
+      when (l > ghc_ver)
+        $ logWarn $
+          "New GHC version available: " <> prettyVer l <> ". To upgrade, run 'ghcup install ghc " <> prettyVer l <> "'"
+
+  forM_ (getLatest dls Cabal) $ \(l, _) -> do
+    let mcabal_ver = latestInstalled Cabal
+    forM mcabal_ver $ \cabal_ver ->
+      when (l > cabal_ver)
+        $ logWarn $
+          "New Cabal version available: " <> prettyVer l <> ". To upgrade, run 'ghcup install cabal " <> prettyVer l <> "'"
+
+  forM_ (getLatest dls HLS) $ \(l, _) -> do
+    let mhls_ver = latestInstalled HLS
+    forM mhls_ver $ \hls_ver ->
+      when (l > hls_ver)
+        $ logWarn $
+          "New HLS version available: " <> prettyVer l <> ". To upgrade, run 'ghcup install hls " <> prettyVer l <> "'"
+
+  forM_ (getLatest dls Stack) $ \(l, _) -> do
+    let mstack_ver = latestInstalled Stack
+    forM mstack_ver $ \stack_ver ->
+      when (l > stack_ver)
+        $ logWarn $
+          "New Stack version available: " <> prettyVer l <> ". To upgrade, run 'ghcup install stack " <> prettyVer l <> "'"

app/ghcup/GHCup/OptParse/Compile.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE RankNTypes #-}
 
@@ -12,15 +13,14 @@ module GHCup.OptParse.Compile where
 
 
 import           GHCup
-import qualified GHCup.GHC as GHC
-import qualified GHCup.HLS as HLS
 import           GHCup.Errors
+import           GHCup.Utils.File
 import           GHCup.Types
 import           GHCup.Types.Optics
 import           GHCup.Utils
-import           GHCup.Prelude.Logger
-import           GHCup.Prelude.String.QQ
+import           GHCup.Utils.Logger
 import           GHCup.OptParse.Common
+import           GHCup.Utils.String.QQ
 
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -32,18 +32,17 @@ import           Control.Monad.Trans.Resource
 import           Data.Bifunctor
 import           Data.Functor
 import           Data.Maybe
-import           Data.Versions                  ( Version, prettyVer, version, pvp )
-import qualified Data.Versions as V
+import           Data.Versions                  ( Version, prettyVer, version )
 import           Data.Text                      ( Text )
 import           Haskus.Utils.Variant.Excepts
 import           Options.Applicative     hiding ( style )
 import           Options.Applicative.Help.Pretty ( text )
 import           Prelude                 hiding ( appendFile )
 import           System.Exit
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 
-import           URI.ByteString          hiding ( uriParser )
 import qualified Data.Text                     as T
-import Control.Exception.Safe (MonadMask, displayException)
+import Control.Exception.Safe (MonadMask)
 import System.FilePath (isPathSeparator)
 import Text.Read (readEither)
 
@@ -57,7 +56,6 @@ import Text.Read (readEither)
 
 data CompileCommand = CompileGHC GHCCompileOptions
                     | CompileHLS HLSCompileOptions
-                    deriving (Eq, Show)
 
 
 
@@ -67,34 +65,31 @@ data CompileCommand = CompileGHC GHCCompileOptions
 
 
 data GHCCompileOptions = GHCCompileOptions
-  { targetGhc    :: GHC.GHCVer
+  { targetGhc    :: Either Version GitBranch
   , bootstrapGhc :: Either Version FilePath
   , jobs         :: Maybe Int
   , buildConfig  :: Maybe FilePath
-  , patches      :: Maybe (Either FilePath [URI])
+  , patchDir     :: Maybe FilePath
   , crossTarget  :: Maybe Text
   , addConfArgs  :: [Text]
   , setCompile   :: Bool
   , ovewrwiteVer :: Maybe Version
   , buildFlavour :: Maybe String
-  , buildSystem  :: Maybe BuildSystem
+  , hadrian      :: Bool
   , isolateDir   :: Maybe FilePath
-  } deriving (Eq, Show)
-
+  }
 
 data HLSCompileOptions = HLSCompileOptions
-  { targetHLS    :: HLS.HLSVer
+  { targetHLS    :: Either Version GitBranch
   , jobs         :: Maybe Int
   , setCompile   :: Bool
-  , updateCabal  :: Bool
-  , ovewrwiteVer :: Either Bool Version
+  , ovewrwiteVer :: Maybe Version
   , isolateDir   :: Maybe FilePath
-  , cabalProject :: Maybe (Either FilePath URI)
-  , cabalProjectLocal :: Maybe URI
-  , patches      :: Maybe (Either FilePath [URI])
+  , cabalProject :: Maybe FilePath
+  , cabalProjectLocal :: Maybe FilePath
+  , patchDir     :: Maybe FilePath
   , targetGHCs   :: [ToolVersion]
-  , cabalArgs    :: [Text]
-  } deriving (Eq, Show)
+  }
 
 
 
@@ -103,7 +98,7 @@ data HLSCompileOptions = HLSCompileOptions
     --[ Parsers ]--
     ---------------
 
-
+          
 compileP :: Parser CompileCommand
 compileP = subparser
   (  command
@@ -150,51 +145,31 @@ Examples:
 
   compileHLSFooter = [s|Discussion:
   Compiles and installs the specified HLS version.
-  The --ghc arguments are necessary to specify which GHC version to build for/against.
+  The last argument is a list of GHC versions to compile for.
   These need to be available in PATH prior to compilation.
 
 Examples:
-  # compile 1.7.0.0 from hackage for 8.10.7, running 'cabal update' before the build
-  ghcup compile hls --version 1.7.0.0 --ghc 8.10.7 --cabal-update
-  # compile from master for ghc 9.2.3 using 'git describe' to name the binary and ignore the pinned index state
-  ghcup compile hls -g master --git-describe-version --ghc 9.2.3 -- --index-state=@(date '+%s')
-  # compile a specific commit for ghc 9.2.3 and set a specifc version for the binary name
-  ghcup compile hls -g a32db0b -o 1.7.0.0-p1 --ghc 9.2.3|]
+  ghcup compile hls -v 1.4.0 -j 12 8.10.5 8.10.7 9.0.1|]
 
 
 ghcCompileOpts :: Parser GHCCompileOptions
 ghcCompileOpts =
   GHCCompileOptions
-    <$> ((GHC.SourceDist <$> option
+    <$> ((Left <$> option
           (eitherReader
             (first (const "Not a valid version") . version . T.pack)
           )
           (short 'v' <> long "version" <> metavar "VERSION" <> help
             "The tool version to compile"
-            <> (completer $ versionCompleter [] GHC)
           )
           ) <|>
-          (GHC.GitDist <$> (GitBranch <$> option
+          (Right <$> (GitBranch <$> option
           str
           (short 'g' <> long "git-ref" <> metavar "GIT_REFERENCE" <> help
             "The git commit/branch/ref to build from"
           ) <*>
-          optional (option str (
-            short 'r' <> long "repository" <> metavar "GIT_REPOSITORY" <> help "The git repository to build from (defaults to GHC upstream)"
-            <> completer (gitFileUri ["https://gitlab.haskell.org/ghc/ghc.git"])
-            ))
-          ))
-          <|>
-          (
-           GHC.RemoteDist <$> (option
-            (eitherReader uriParser)
-            (long "remote-source-dist" <> metavar "URI" <> help
-              "URI (https/http/file) to a GHC source distribution"
-              <> completer fileUri
-            )
-          )
-          )
-          )
+          optional (option str (short 'r' <> long "repository" <> metavar "GIT_REPOSITORY" <> help "The git repository to build from (defaults to GHC upstream)"))
+          )))
     <*> option
           (eitherReader
             (\x ->
@@ -206,14 +181,12 @@ ghcCompileOpts =
           <> metavar "BOOTSTRAP_GHC"
           <> help
                "The GHC version (or full path) to bootstrap with (must be installed)"
-          <> (completer $ versionCompleter [] GHC)
           )
     <*> optional
           (option
             (eitherReader (readEither @Int))
             (short 'j' <> long "jobs" <> metavar "JOBS" <> help
               "How many jobs to use for make"
-              <> (completer $ listCompleter $ fmap show ([1..12] :: [Int]))
             )
           )
     <*> optional
@@ -221,28 +194,15 @@ ghcCompileOpts =
             str
             (short 'c' <> long "config" <> metavar "CONFIG" <> help
               "Absolute path to build config file"
-             <> completer (bashCompleter "file")
             )
           )
-    <*> (optional
-          (
-            (fmap Right $ many $ option
-              (eitherReader uriParser)
-              (long "patch" <> metavar "PATCH_URI" <> help
-                "URI to a patch (https/http/file)"
-               <> completer fileUri
-              )
-            )
-            <|>
-            (fmap Left $ option
-              str
-              (short 'p' <> long "patchdir" <> metavar "PATCH_DIR" <> help
-                "Absolute path to patch directory (applies all .patch and .diff files in order using -p1. This order is determined by a quilt series file if it exists, or the patches are lexicographically ordered)"
-               <> completer (bashCompleter "directory")
-              )
+    <*> optional
+          (option
+            str
+            (short 'p' <> long "patchdir" <> metavar "PATCH_DIR" <> help
+              "Absolute path to patch directory (applies all .patch and .diff files in order using -p1)"
             )
           )
-        )
     <*> optional
           (option
             str
@@ -250,8 +210,13 @@ ghcCompileOpts =
               "Build cross-compiler for this platform"
             )
           )
-    <*> many (argument str (metavar "CONFIGURE_ARGS" <> help "Additional arguments to compile configure, prefix with '-- ' (longopts)"))
-    <*> fmap (fromMaybe False) (invertableSwitch "set" Nothing False (help "Set as active version after install"))
+    <*> many (argument str (metavar "CONFIGURE_ARGS" <> help "Additional arguments to configure, prefix with '-- ' (longopts)"))
+    <*> flag
+          False
+          True
+          (long "set" <> help
+            "Set as active version after install"
+          )
     <*> optional
           (option
             (eitherReader
@@ -259,7 +224,6 @@ 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 [] GHC)
             )
           )
     <*> optional
@@ -269,150 +233,90 @@ ghcCompileOpts =
               "Set the compile build flavour (this value depends on the build system type: 'make' vs 'hadrian')"
             )
           )
-    <*> (
-         (\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."
+    <*> 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 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 absolute directory instead of the default one, no symlinks to this installation will be made"
-            <> completer (bashCompleter "directory")
+            <> help "install in an isolated directory instead of the default one, no symlinks to this installation will be made"
             )
            )
 
 hlsCompileOpts :: Parser HLSCompileOptions
 hlsCompileOpts =
   HLSCompileOptions
-    <$> ((HLS.HackageDist <$> option
+    <$> ((Left <$> option
           (eitherReader
-            ((>>= first displayException . V.version . V.prettyPVP) . first (const "Not a valid PVP version") . pvp . T.pack)
+            (first (const "Not a valid version") . version . T.pack)
           )
           (short 'v' <> long "version" <> metavar "VERSION" <> help
-            "The version to compile (pulled from hackage)"
-            <> (completer $ versionCompleter' [] HLS (either (const False) (const True) . V.pvp . V.prettyVer))
+            "The tool version to compile"
           )
-          )
-          <|>
-          (HLS.GitDist <$> (GitBranch <$> option
+          ) <|>
+          (Right <$> (GitBranch <$> option
           str
           (short 'g' <> long "git-ref" <> metavar "GIT_REFERENCE" <> help
-            "The git commit/branch/ref to build from (accepts anything 'git checkout' accepts)"
+            "The git commit/branch/ref to build from"
           ) <*>
-          optional (option str (short 'r' <> long "repository" <> metavar "GIT_REPOSITORY" <> help "The git repository to build from (defaults to HLS upstream)"
-            <> completer (gitFileUri ["https://github.com/haskell/haskell-language-server.git"])
-          ))
-          ))
-          <|>
-          (HLS.SourceDist <$> (option
-            (eitherReader
-              (first (const "Not a valid version") . version . T.pack)
-            )
-          (long "source-dist" <> metavar "VERSION" <> help
-            "The version to compile (pulled from packaged git sources)"
-            <> (completer $ versionCompleter [] HLS)
-          )
-          ))
-          <|>
-          (
-           HLS.RemoteDist <$> (option
-            (eitherReader uriParser)
-            (long "remote-source-dist" <> metavar "URI" <> help
-              "URI (https/http/file) to a HLS source distribution"
-              <> completer fileUri
-            )
-          )
-          )
-          )
+          optional (option str (short 'r' <> long "repository" <> metavar "GIT_REPOSITORY" <> help "The git repository to build from (defaults to GHC upstream)"))
+          )))
     <*> optional
           (option
             (eitherReader (readEither @Int))
             (short 'j' <> long "jobs" <> metavar "JOBS" <> help
               "How many jobs to use for make"
-              <> (completer $ listCompleter $ fmap show ([1..12] :: [Int]))
             )
           )
-    <*> fmap (fromMaybe True) (invertableSwitch "set" Nothing True (help "Don't set as active version after install"))
-    <*> switch (long "cabal-update" <> help "Run 'cabal update' before the build")
-    <*>
-         (
-          (Right <$> option
+    <*> flag
+          False
+          True
+          (long "set" <> help
+            "Set as active version after install"
+          )
+    <*> optional
+          (option
             (eitherReader
               (first (const "Not a valid version") . version . T.pack)
             )
             (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 [] HLS)
             )
           )
-          <|>
-          (Left <$> (switch
-                      (long "git-describe-version"
-                         <> help "Use the output of 'git describe' (if building from git) as the VERSION component of the installed binary."
-                      )
-                    )
-          )
-          )
     <*> optional
           (option
             (eitherReader isolateParser)
             (  short 'i'
             <> long "isolate"
             <> metavar "DIR"
-            <> help "install in an isolated absolute directory instead of the default one, no symlinks to this installation will be made"
-            <> completer (bashCompleter "directory")
+            <> help "install in an isolated directory instead of the default one, no symlinks to this installation will be made"
             )
            )
     <*> optional
           (option
-            ((fmap Right $ eitherReader uriParser) <|> (fmap Left str))
+            str
             (long "cabal-project" <> metavar "CABAL_PROJECT" <> help
-              "If relative filepath, specifies the path to cabal.project inside the unpacked HLS tarball/checkout. Otherwise expects a full URI with https/http/file scheme."
-              <> completer fileUri
+              "If relative, specifies the path to cabal.project inside the unpacked HLS tarball/checkout. If absolute, will copy the file over."
             )
           )
     <*> optional
           (option
-            (eitherReader uriParser)
+            (eitherReader absolutePathParser)
             (long "cabal-project-local" <> metavar "CABAL_PROJECT_LOCAL" <> help
-              "URI (https/http/file) to a cabal.project.local to be used for the build. Will be copied over."
-              <> completer fileUri
+              "Absolute path to a cabal.project.local to be used for the build. Will be copied over."
             )
           )
-    <*> (optional
-          (
-            (fmap Right $ many $ option
-              (eitherReader uriParser)
-              (long "patch" <> metavar "PATCH_URI" <> help
-                "URI to a patch (https/http/file)"
-              <> completer fileUri
-              )
-            )
-            <|>
-            (fmap Left $ option
-              str
-              (short 'p' <> long "patchdir" <> metavar "PATCH_DIR" <> help
-                "Absolute path to patch directory (applies all .patch and .diff files in order using -p1)"
-              <> completer (bashCompleter "directory")
-              )
+    <*> optional
+          (option
+            (eitherReader absolutePathParser)
+            (short 'p' <> long "patchdir" <> metavar "PATCH_DIR" <> help
+              "Absolute path to patch directory (applies all .patch and .diff files in order using -p1)"
             )
           )
-        )
-    <*> some (
-          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 [] GHC))
-        )
-    <*> many (argument str (metavar "CABAL_ARGS" <> help "Additional arguments to cabal install, prefix with '-- ' (longopts)"))
+    <*> some (toolVersionArgument Nothing (Just GHC))
 
 
 
@@ -426,7 +330,6 @@ hlsCompileOpts =
 type GHCEffects = '[ AlreadyInstalled
                   , BuildFailed
                   , DigestError
-                  , ContentLengthError
                   , GPGError
                   , DownloadFailed
                   , GHCupSetError
@@ -444,13 +347,10 @@ type GHCEffects = '[ AlreadyInstalled
                   , ProcessError
                   , CopyError
                   , BuildFailed
-                  , UninstallFailed
-                  , MergeFileTreeError
                   ]
 type HLSEffects = '[ AlreadyInstalled
                   , BuildFailed
                   , DigestError
-                  , ContentLengthError
                   , GPGError
                   , DownloadFailed
                   , GHCupSetError
@@ -460,14 +360,11 @@ type HLSEffects = '[ AlreadyInstalled
                   , UnknownArchive
                   , TarDirDoesNotExist
                   , TagNotFound
-                  , DayNotFound
                   , NextVerNotFound
                   , NoToolVersionSet
                   , NotInstalled
                   , DirNotEmpty
                   , ArchiveResult
-                  , UninstallFailed
-                  , MergeFileTreeError
                   ]
 
 
@@ -507,40 +404,38 @@ compile :: ( Monad m
            )
       => CompileCommand
       -> Settings
-      -> Dirs
       -> (forall eff a . ReaderT AppState m (VEither eff a) -> m (VEither eff a))
       -> (ReaderT LeanAppState m () -> m ())
       -> m ExitCode
-compile compileCommand settings Dirs{..} runAppState runLogger = do
+compile compileCommand settings runAppState runLogger = do
+  VRight Dirs{ .. }  <- runAppState (VRight <$> getDirs)
   case compileCommand of
     (CompileHLS HLSCompileOptions { .. }) -> do
       runCompileHLS runAppState (do
         case targetHLS of
-          HLS.SourceDist targetVer -> do
+          Left targetVer -> do
             GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-            let vi = getVersionInfo (mkTVer targetVer) HLS dls
+            let vi = getVersionInfo targetVer HLS dls
             forM_ (_viPreCompile =<< vi) $ \msg -> do
               lift $ logInfo msg
               lift $ logInfo
                 "...waiting for 5 seconds, you can still abort..."
               liftIO $ threadDelay 5000000 -- for compilation, give the user a sec to intervene
-          _ -> pure ()
+          Right _ -> pure ()
         ghcs <- liftE $ forM targetGHCs (\ghc -> fmap (_tvVersion . fst) . fromVersion (Just ghc) $ GHC)
         targetVer <- liftE $ compileHLS
                     targetHLS
                     ghcs
                     jobs
                     ovewrwiteVer
-                    (maybe GHCupInternal IsolateDir isolateDir)
+                    isolateDir
                     cabalProject
                     cabalProjectLocal
-                    updateCabal
-                    patches
-                    cabalArgs
+                    patchDir
         GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-        let vi = getVersionInfo (mkTVer targetVer) HLS dls
+        let vi = getVersionInfo targetVer HLS dls
         when setCompile $ void $ liftE $
-          setHLS targetVer SetHLSOnly Nothing
+          setHLS targetVer
         pure (vi, targetVer)
         )
         >>= \case
@@ -553,43 +448,45 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
                 pure ExitSuccess
               VLeft err@(V (BuildFailed tmpdir _)) -> do
                 case keepDirs settings of
-                  Never -> runLogger $ logError $ T.pack $ prettyHFError err
-                  _ -> runLogger (logError $ T.pack (prettyHFError err) <> "\n" <>
-                        "Check the logs at " <> T.pack (fromGHCupPath logsDir) <> " and the build directory "
+                  Never -> runLogger $ logError $ T.pack $ prettyShow err
+                  _ -> runLogger (logError $ T.pack (prettyShow err) <> "\n" <>
+                        "Check the logs at " <> T.pack logsDir <> " and the build directory "
                         <> T.pack tmpdir <> " for more clues." <> "\n" <>
                         "Make sure to clean up " <> T.pack tmpdir <> " afterwards.")
                 pure $ ExitFailure 9
               VLeft e -> do
-                runLogger $ logError $ T.pack $ prettyHFError e
+                runLogger $ logError $ T.pack $ prettyShow 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
+          Left targetVer -> do
             GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-            let vi = getVersionInfo (mkTVer targetVer) GHC dls
+            let vi = getVersionInfo targetVer GHC dls
             forM_ (_viPreCompile =<< vi) $ \msg -> do
               lift $ logInfo msg
               lift $ logInfo
                 "...waiting for 5 seconds, you can still abort..."
               liftIO $ threadDelay 5000000 -- for compilation, give the user a sec to intervene
-          _ -> pure ()
+          Right _ -> pure ()
         targetVer <- liftE $ compileGHC
-                    targetGhc
-                    crossTarget
+                    (first (GHCTargetVersion crossTarget) targetGhc)
                     ovewrwiteVer
                     bootstrapGhc
                     jobs
                     buildConfig
-                    patches
+                    patchDir
                     addConfArgs
                     buildFlavour
-                    buildSystem
-                    (maybe GHCupInternal IsolateDir isolateDir)
+                    hadrian
+                    isolateDir
         GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-        let vi = getVersionInfo targetVer GHC dls
+        let vi = getVersionInfo (_tvVersion targetVer) GHC dls
         when setCompile $ void $ liftE $
-          setGHC targetVer SetGHCOnly Nothing
+          setGHC targetVer SetGHCOnly
         pure (vi, targetVer)
         )
         >>= \case
@@ -602,20 +499,20 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
                 pure ExitSuccess
               VLeft (V (AlreadyInstalled _ v)) -> do
                 runLogger $ logWarn $
-                  "GHC ver " <> prettyVer v <> " already installed, remove it first to reinstall"
+                  "GHC ver " <> prettyVer v <> " already installed; if you really want to reinstall it, you may want to run 'ghcup install ghc --force " <> prettyVer v <> "'"
                 pure ExitSuccess
               VLeft (V (DirNotEmpty fp)) -> do
-                runLogger $ logError $
-                  "Install directory " <> T.pack fp <> " is not empty."
+                runLogger $ logWarn $
+                  "Install directory " <> T.pack fp <> " is not empty. Use 'ghcup install ghc --isolate " <> T.pack fp <> " --force ..." <> "' to install regardless."
                 pure $ ExitFailure 3
               VLeft err@(V (BuildFailed tmpdir _)) -> do
                 case keepDirs settings of
-                  Never -> runLogger $ logError $ T.pack $ prettyHFError err
-                  _ -> runLogger (logError $ T.pack (prettyHFError err) <> "\n" <>
-                        "Check the logs at " <> T.pack (fromGHCupPath logsDir) <> " and the build directory "
+                  Never -> runLogger $ logError $ T.pack $ prettyShow err
+                  _ -> runLogger $ (logError $ T.pack (prettyShow err) <> "\n" <>
+                        "Check the logs at " <> T.pack logsDir <> " and the build directory "
                         <> T.pack tmpdir <> " for more clues." <> "\n" <>
                         "Make sure to clean up " <> T.pack tmpdir <> " afterwards.")
                 pure $ ExitFailure 9
               VLeft e -> do
-                runLogger $ logError $ T.pack $ prettyHFError e
+                runLogger $ logError $ T.pack $ prettyShow e
                 pure $ ExitFailure 9

app/ghcup/GHCup/OptParse/Config.hs

@@ -0,0 +1,169 @@
+{-# LANGUAGE CPP               #-}
+{-# LANGUAGE DataKinds         #-}
+{-# LANGUAGE TypeApplications  #-}
+{-# LANGUAGE FlexibleContexts  #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell   #-}
+{-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE RankNTypes #-}
+
+module GHCup.OptParse.Config where
+
+
+import           GHCup.Errors
+import           GHCup.Types
+import           GHCup.Utils
+import           GHCup.Utils.Prelude
+import           GHCup.Utils.Logger
+import           GHCup.Utils.String.QQ
+
+#if !MIN_VERSION_base(4,13,0)
+import           Control.Monad.Fail             ( MonadFail )
+#endif
+import           Control.Monad.Reader
+import           Control.Monad.Trans.Resource
+import           Data.Bifunctor
+import           Data.Functor
+import           Data.Maybe
+import           Haskus.Utils.Variant.Excepts
+import           Options.Applicative     hiding ( style )
+import           Prelude                 hiding ( appendFile )
+import           System.Exit
+
+import qualified Data.Text                     as T
+import qualified Data.ByteString.UTF8          as UTF8
+import qualified Data.YAML.Aeson               as Y
+import Control.Exception.Safe (MonadMask)
+
+
+
+
+    ----------------
+    --[ Commands ]--
+    ----------------
+
+
+data ConfigCommand
+  = ShowConfig
+  | SetConfig String String
+  | InitConfig
+
+
+
+    ---------------
+    --[ Parsers ]--
+    ---------------
+
+          
+configP :: Parser ConfigCommand
+configP = subparser
+      (  command "init" initP
+      <> command "set"  setP -- [set] KEY VALUE at help lhs
+      <> command "show" showP
+      )
+    <|> argsP -- add show for a single option
+    <|> pure ShowConfig
+ where
+  initP = info (pure InitConfig) (progDesc "Write default config to ~/.ghcup/config.yaml")
+  showP = info (pure ShowConfig) (progDesc "Show current config (default)")
+  setP  = info argsP (progDesc "Set config KEY to VALUE")
+  argsP = SetConfig <$> argument str (metavar "KEY") <*> argument str (metavar "VALUE")
+
+
+
+
+    --------------
+    --[ Footer ]--
+    --------------
+
+
+configFooter :: String
+configFooter = [s|Examples:
+
+  # show current config
+  ghcup config
+
+  # initialize config
+  ghcup config init
+
+  # set <key> <value> configuration pair
+  ghcup config <key> <value>|]
+
+
+
+    -----------------
+    --[ Utilities ]--
+    -----------------
+
+
+formatConfig :: UserSettings -> String
+formatConfig = UTF8.toString . Y.encode1Strict
+
+
+updateSettings :: Monad m => UTF8.ByteString -> Settings -> Excepts '[JSONError] m Settings
+updateSettings config' settings = do
+  settings' <- lE' JSONDecodeError . first snd . Y.decode1Strict $ config'
+  pure $ mergeConf settings' settings
+  where
+   mergeConf :: UserSettings -> Settings -> Settings
+   mergeConf UserSettings{..} Settings{..} =
+     let cache'      = fromMaybe cache uCache
+         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
+     in Settings cache' noVerify' keepDirs' downloader' verbose' urlSource' noNetwork' gpgSetting' noColor
+
+
+
+    ------------------
+    --[ Entrypoint ]--
+    ------------------
+
+
+
+config :: ( Monad m
+          , MonadMask m
+          , MonadUnliftIO m
+          , MonadFail m
+          )
+     => ConfigCommand
+     -> Settings
+     -> KeyBindings
+     -> (ReaderT LeanAppState m () -> m ())
+     -> m ExitCode
+config configCommand settings keybindings runLogger = case configCommand of
+  InitConfig -> do
+    path <- getConfigFilePath
+    liftIO $ writeFile path $ formatConfig $ fromSettings settings (Just keybindings)
+    runLogger $ logDebug $ "config.yaml initialized at " <> T.pack path
+    pure ExitSuccess
+
+  ShowConfig -> do
+    liftIO $ putStrLn $ formatConfig $ fromSettings settings (Just keybindings)
+    pure ExitSuccess
+
+  (SetConfig k v) -> do
+    case v of
+      "" -> do
+        runLogger $ logError "Empty values are not allowed"
+        pure $ ExitFailure 55
+      _  -> do
+        r <- runE @'[JSONError] $ do
+          settings' <- updateSettings (UTF8.fromString (k <> ": " <> v <> "\n")) settings
+          path <- liftIO getConfigFilePath
+          liftIO $ writeFile path $ formatConfig $ fromSettings settings' (Just keybindings)
+          lift $ runLogger $ logDebug $ T.pack $ show settings'
+          pure ()
+
+        case r of
+            VRight _ -> pure ExitSuccess
+            VLeft (V (JSONDecodeError e)) -> do
+              runLogger $ logError $ "Error decoding config: " <> T.pack e
+              pure $ ExitFailure 65
+            VLeft _ -> pure $ ExitFailure 65

app/ghcup/GHCup/OptParse/DInfo.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE RankNTypes #-}
 
@@ -17,10 +18,9 @@ import           GHCup
 import           GHCup.Errors
 import           GHCup.Version
 import           GHCup.Types
+import           GHCup.Utils.Prelude
 import           GHCup.Utils.Dirs
-import           GHCup.Prelude
-import           GHCup.Prelude.Logger
-import           GHCup.Prelude.Process
+import           GHCup.Utils.Logger
 
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -37,6 +37,7 @@ import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 
 import qualified Data.Text                     as T
 import Control.Exception.Safe (MonadMask)
+import GHCup.Utils.File
 import Language.Haskell.TH
 
 
@@ -51,7 +52,7 @@ describe_result = $( LitE . StringL <$>
                      runIO (do
                              CapturedProcess{..} <-  do
                               dirs <- liftIO getAllDirs
-                              let settings = AppState (defaultSettings { noNetwork = True })
+                              let settings = AppState (Settings True False Never Curl False GHCupURL False GPGNone False)
                                                dirs
                                                defaultKeyBindings
                               flip runReaderT settings $ executeOut "git" ["describe"] Nothing
@@ -83,7 +84,7 @@ prettyDebugInfo DebugInfo {..} = "Debug Info" <> "\n" <>
 type DInfoEffects = '[ NoCompatiblePlatform , NoCompatibleArch , DistroNotFound ]
 
 runDebugInfo :: (ReaderT env m (VEither DInfoEffects a) -> m (VEither DInfoEffects a))
-             -> Excepts DInfoEffects (ReaderT env m) a
+             -> (Excepts DInfoEffects (ReaderT env m) a)
              -> m (VEither DInfoEffects a)
 runDebugInfo runAppState =
         runAppState
@@ -115,5 +116,5 @@ dinfo runAppState runLogger = do
             liftIO $ putStrLn $ prettyDebugInfo di
             pure ExitSuccess
           VLeft e -> do
-            runLogger $ logError $ T.pack $ prettyHFError e
+            runLogger $ logError $ T.pack $ prettyShow e
             pure $ ExitFailure 8

app/ghcup/GHCup/OptParse/GC.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE RankNTypes #-}
 
@@ -14,8 +15,8 @@ module GHCup.OptParse.GC where
 import           GHCup
 import           GHCup.Errors
 import           GHCup.Types
-import           GHCup.Prelude.Logger
-import           GHCup.Prelude.String.QQ
+import           GHCup.Utils.Logger
+import           GHCup.Utils.String.QQ
 
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -27,6 +28,7 @@ import           Haskus.Utils.Variant.Excepts
 import           Options.Applicative     hiding ( style )
 import           Prelude                 hiding ( appendFile )
 import           System.Exit
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 
 import qualified Data.Text                     as T
 import Control.Exception.Safe (MonadMask)
@@ -47,7 +49,7 @@ data GCOptions = GCOptions
   , gcHLSNoGHC :: Bool
   , gcCache :: Bool
   , gcTmp :: Bool
-  } deriving (Eq, Show)
+  }
 
 
 
@@ -55,26 +57,26 @@ data GCOptions = GCOptions
     --[ Parsers ]--
     ---------------
 
-
+          
 gcP :: Parser GCOptions
 gcP =
   GCOptions
-  <$>
+  <$> 
     switch
       (short 'o' <> long "ghc-old" <> help "Remove GHC versions marked as 'old'")
-  <*>
+  <*> 
     switch
       (short 'p' <> long "profiling-libs" <> help "Remove profiling libs of GHC versions")
-  <*>
+  <*> 
     switch
       (short 's' <> long "share-dir" <> help "Remove GHC share directories (documentation)")
-  <*>
+  <*> 
     switch
       (short 'h' <> long "hls-no-ghc" <> help "Remove HLS versions that don't have a corresponding installed GHC version")
-  <*>
+  <*> 
     switch
       (short 'c' <> long "cache" <> help "GC the GHCup cache")
-  <*>
+  <*> 
     switch
       (short 't' <> long "tmpdirs" <> help "Remove tmpdir leftovers")
 
@@ -97,12 +99,12 @@ gcFooter = [s|Discussion:
     ---------------------------
 
 
-type GCEffects = '[ NotInstalled, UninstallFailed ]
+type GCEffects = '[ NotInstalled ]
 
 
 runGC :: MonadUnliftIO m
       => (ReaderT AppState m (VEither GCEffects a) -> m (VEither GCEffects a))
-      -> Excepts GCEffects (ResourceT (ReaderT AppState m)) a
+      -> (Excepts GCEffects (ResourceT (ReaderT AppState m)) a)
       -> m (VEither GCEffects a)
 runGC runAppState =
   runAppState
@@ -128,15 +130,15 @@ gc :: ( Monad m
    -> (ReaderT LeanAppState m () -> m ())
    -> m ExitCode
 gc GCOptions{..} runAppState runLogger = runGC runAppState (do
-  when gcOldGHC (liftE rmOldGHC)
+  when gcOldGHC rmOldGHC
   lift $ when gcProfilingLibs rmProfilingLibs
   lift $ when gcShareDir rmShareDir
-  liftE $ when gcHLSNoGHC rmHLSNoGHC
+  lift $ when gcHLSNoGHC rmHLSNoGHC
   lift $ when gcCache rmCache
   lift $ when gcTmp rmTmp
    ) >>= \case
             VRight _ -> do
                   pure ExitSuccess
             VLeft e -> do
-              runLogger $ logError $ T.pack $ prettyHFError e
+              runLogger $ logError $ T.pack $ prettyShow e
               pure $ ExitFailure 27

app/ghcup/GHCup/OptParse/Install.hs

@@ -0,0 +1,465 @@
+{-# LANGUAGE CPP               #-}
+{-# LANGUAGE DataKinds         #-}
+{-# LANGUAGE TypeApplications  #-}
+{-# LANGUAGE FlexibleContexts  #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell   #-}
+{-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+
+module GHCup.OptParse.Install where
+
+
+
+
+import           GHCup.OptParse.Common
+
+import           GHCup
+import           GHCup.Errors
+import           GHCup.Types
+import           GHCup.Utils.File
+import           GHCup.Utils.Logger
+import           GHCup.Utils.String.QQ
+
+import           Codec.Archive
+#if !MIN_VERSION_base(4,13,0)
+import           Control.Monad.Fail             ( MonadFail )
+#endif
+import           Control.Monad.Reader
+import           Control.Monad.Trans.Resource
+import           Data.Either
+import           Data.Functor
+import           Data.Maybe
+import           Data.Versions           hiding ( str )
+import           Haskus.Utils.Variant.Excepts
+import           Options.Applicative     hiding ( style )
+import           Options.Applicative.Help.Pretty ( text )
+import           Prelude                 hiding ( appendFile )
+import           System.Exit
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
+import           URI.ByteString
+
+import qualified Data.Text                     as T
+
+
+
+
+    ----------------
+    --[ Commands ]--
+    ----------------
+
+
+data InstallCommand = InstallGHC InstallOptions
+                    | InstallCabal InstallOptions
+                    | InstallHLS InstallOptions
+                    | InstallStack InstallOptions
+
+
+
+
+    ---------------
+    --[ Options ]--
+    ---------------
+
+
+data InstallOptions = InstallOptions
+  { instVer      :: Maybe ToolVersion
+  , instPlatform :: Maybe PlatformRequest
+  , instBindist  :: Maybe URI
+  , instSet      :: Bool
+  , isolateDir   :: Maybe FilePath
+  , forceInstall :: Bool
+  }
+
+
+
+    ---------------
+    --[ Footers ]--
+    ---------------
+
+installCabalFooter :: String
+installCabalFooter = [s|Discussion:
+  Installs the specified cabal-install version (or a recommended default one)
+  into "~/.ghcup/bin", so it can be overwritten by later
+  "cabal install cabal-install", which installs into "~/.cabal/bin" by
+  default. Make sure to set up your PATH appropriately, so the cabal
+  installation takes precedence.|]
+
+
+
+    ---------------
+    --[ Parsers ]--
+    ---------------
+
+installParser :: Parser (Either InstallCommand InstallOptions)
+installParser =
+  (Left <$> subparser
+      (  command
+          "ghc"
+          (   InstallGHC
+          <$> info
+                (installOpts (Just GHC) <**> helper)
+                (  progDesc "Install GHC"
+                <> footerDoc (Just $ text installGHCFooter)
+                )
+          )
+      <> command
+           "cabal"
+           (   InstallCabal
+           <$> info
+                 (installOpts (Just Cabal) <**> helper)
+                 (  progDesc "Install Cabal"
+                 <> footerDoc (Just $ text installCabalFooter)
+                 )
+           )
+      <> command
+           "hls"
+           (   InstallHLS
+           <$> info
+                 (installOpts (Just HLS) <**> helper)
+                 (  progDesc "Install haskell-language-server"
+                 <> footerDoc (Just $ text installHLSFooter)
+                 )
+           )
+      <> command
+           "stack"
+           (   InstallStack
+           <$> info
+                 (installOpts (Just Stack) <**> helper)
+                 (  progDesc "Install stack"
+                 <> footerDoc (Just $ text installStackFooter)
+                 )
+           )
+      )
+    )
+    <|> (Right <$> installOpts Nothing)
+ where
+  installHLSFooter :: String
+  installHLSFooter = [s|Discussion:
+  Installs haskell-language-server binaries and wrapper
+  into "~/.ghcup/bin"
+
+Examples:
+  # install recommended HLS
+  ghcup install hls|]
+
+  installStackFooter :: String
+  installStackFooter = [s|Discussion:
+  Installs stack binaries into "~/.ghcup/bin"
+
+Examples:
+  # install recommended Stack
+  ghcup install stack|]
+
+  installGHCFooter :: String
+  installGHCFooter = [s|Discussion:
+  Installs the specified GHC version (or a recommended default one) into
+  a self-contained "~/.ghcup/ghc/<ghcver>" directory
+  and symlinks the ghc binaries to "~/.ghcup/bin/<binary>-<ghcver>".
+
+Examples:
+  # install recommended GHC
+  ghcup install ghc
+
+  # install latest GHC
+  ghcup install ghc latest
+
+  # install GHC 8.10.2
+  ghcup install ghc 8.10.2
+
+  # install GHC head fedora bindist
+  ghcup install ghc -u https://gitlab.haskell.org/api/v4/projects/1/jobs/artifacts/master/raw/ghc-x86_64-fedora27-linux.tar.xz?job=validate-x86_64-linux-fedora27 head|]
+
+
+installOpts :: Maybe Tool -> Parser InstallOptions
+installOpts tool =
+  (\p (u, v) b is f -> InstallOptions v p u b is f)
+    <$> optional
+          (option
+            (eitherReader platformParser)
+            (  short 'p'
+            <> long "platform"
+            <> metavar "PLATFORM"
+            <> help
+                 "Override for platform (triple matching ghc tarball names), e.g. x86_64-fedora27-linux"
+            )
+          )
+    <*> (   (   (,)
+            <$> optional
+                  (option
+                    (eitherReader bindistParser)
+                    (short 'u' <> long "url" <> metavar "BINDIST_URL" <> help
+                      "Install the specified version from this bindist"
+                    )
+                  )
+            <*> (Just <$> toolVersionArgument Nothing tool)
+            )
+        <|> pure (Nothing, Nothing)
+        )
+    <*> flag
+          False
+          True
+          (long "set" <> help
+            "Set as active version after install"
+          )
+    <*> optional
+          (option
+           (eitherReader isolateParser)
+           (  short 'i'
+           <> long "isolate"
+           <> metavar "DIR"
+           <> help "install in an isolated dir instead of the default one"
+           )
+          )
+    <*> switch
+          (short 'f' <> long "force" <> help "Force install")
+          
+
+
+
+    --------------
+    --[ Footer ]--
+    --------------
+
+
+installToolFooter :: String
+installToolFooter = [s|Discussion:
+  Installs GHC or cabal. When no command is given, installs GHC
+  with the specified version/tag.
+  It is recommended to always specify a subcommand (ghc/cabal/hls/stack).|]
+
+
+
+
+    ---------------------------
+    --[ Effect interpreters ]--
+    ---------------------------
+
+type InstallEffects = '[ AlreadyInstalled
+                       , UnknownArchive
+                       , ArchiveResult
+                       , FileDoesNotExistError
+                       , CopyError
+                       , NotInstalled
+                       , DirNotEmpty
+                       , NoDownload
+                       , NotInstalled
+                       , BuildFailed
+                       , TagNotFound
+                       , DigestError
+                       , GPGError
+                       , DownloadFailed
+                       , TarDirDoesNotExist
+                       , NextVerNotFound
+                       , NoToolVersionSet
+                       , FileAlreadyExistsError
+                       , ProcessError
+                       ]
+
+
+runInstTool :: AppState
+            -> Maybe PlatformRequest
+            -> Excepts InstallEffects (ResourceT (ReaderT AppState IO)) a
+            -> IO (VEither InstallEffects a)
+runInstTool appstate' mInstPlatform =
+  flip runReaderT (maybe appstate' (\x -> appstate'{ pfreq = x } :: AppState) mInstPlatform)
+  . runResourceT
+  . runE
+    @InstallEffects
+
+
+
+    -------------------
+    --[ Entrypoints ]--
+    -------------------
+
+
+install :: (Either InstallCommand InstallOptions) -> Settings -> IO AppState -> (ReaderT LeanAppState IO () -> IO ()) -> IO ExitCode
+install installCommand settings getAppState' runLogger = case installCommand of
+  (Right iopts) -> do
+    runLogger (logWarn "This is an old-style command for installing GHC. Use 'ghcup install ghc' instead.")
+    installGHC iopts
+  (Left (InstallGHC iopts)) -> installGHC iopts
+  (Left (InstallCabal iopts)) -> installCabal iopts
+  (Left (InstallHLS iopts)) -> installHLS iopts
+  (Left (InstallStack iopts)) -> installStack iopts
+ where
+  installGHC :: InstallOptions -> IO ExitCode
+  installGHC InstallOptions{..} = do
+    s'@AppState{ dirs = Dirs{ .. } } <- liftIO getAppState'
+    (case instBindist of
+       Nothing -> runInstTool s' instPlatform $ do
+         (v, vi) <- liftE $ fromVersion instVer GHC
+         liftE $ installGHCBin
+                   (_tvVersion v)
+                   isolateDir
+                   forceInstall
+         when instSet $ void $ liftE $ setGHC v SetGHCOnly
+         pure vi
+       Just uri -> do
+         runInstTool s'{ settings = settings {noVerify = True}} instPlatform $ do
+           (v, vi) <- liftE $ fromVersion instVer GHC
+           liftE $ installGHCBindist
+                     (DownloadInfo uri (Just $ RegexDir "ghc-.*") "")
+                     (_tvVersion v)
+                     isolateDir
+                     forceInstall
+           when instSet $ void $ liftE $ setGHC v SetGHCOnly
+           pure vi
+      )
+        >>= \case
+              VRight vi -> do
+                runLogger $ logInfo "GHC installation successful"
+                forM_ (_viPostInstall =<< vi) $ \msg ->
+                  runLogger $ logInfo msg
+                pure ExitSuccess
+              VLeft (V (AlreadyInstalled _ v)) -> do
+                runLogger $ logWarn $
+                  "GHC ver " <> prettyVer v <> " already installed; if you really want to reinstall it, you may want to run 'ghcup install ghc --force " <> prettyVer v <> "'"
+                pure ExitSuccess
+              VLeft (V (DirNotEmpty fp)) -> do
+                runLogger $ logWarn $
+                  "Install directory " <> T.pack fp <> " is not empty. Use 'ghcup install ghc --isolate " <> T.pack fp <> " --force ..." <> "' to install regardless."
+                pure $ ExitFailure 3
+              VLeft err@(V (BuildFailed tmpdir _)) -> do
+                case keepDirs settings of
+                  Never -> runLogger $ (logError $ T.pack $ prettyShow err)
+                  _ -> runLogger $ (logError $ T.pack (prettyShow err) <> "\n" <>
+                    "Check the logs at " <> T.pack logsDir <> " and the build directory " <> T.pack tmpdir <> " for more clues." <> "\n" <>
+                    "Make sure to clean up " <> T.pack tmpdir <> " afterwards.")
+                pure $ ExitFailure 3
+              VLeft e -> do
+                runLogger $ do
+                  logError $ T.pack $ prettyShow e
+                  logError $ "Also check the logs in " <> T.pack logsDir
+                pure $ ExitFailure 3
+
+
+  installCabal :: InstallOptions -> IO ExitCode
+  installCabal InstallOptions{..} = do
+    s'@AppState{ dirs = Dirs{ .. } } <- liftIO getAppState'
+    (case instBindist of
+       Nothing -> runInstTool s' instPlatform $ do
+         (v, vi) <- liftE $ fromVersion instVer Cabal
+         liftE $ installCabalBin
+                   (_tvVersion v)
+                   isolateDir
+                   forceInstall
+         pure vi
+       Just uri -> do
+         runInstTool s'{ settings = settings { noVerify = True}} instPlatform $ do
+           (v, vi) <- liftE $ fromVersion instVer Cabal
+           liftE $ installCabalBindist 
+                     (DownloadInfo uri Nothing "")
+                     (_tvVersion v)
+                     isolateDir
+                     forceInstall
+           pure vi
+      )
+      >>= \case
+            VRight vi -> do
+              runLogger $ logInfo "Cabal installation successful"
+              forM_ (_viPostInstall =<< vi) $ \msg ->
+                runLogger $ logInfo msg
+              pure ExitSuccess
+            VLeft (V (AlreadyInstalled _ v)) -> do
+              runLogger $ logWarn $
+                "Cabal ver " <> prettyVer v <> " already installed; if you really want to reinstall it, you may want to run 'ghcup install cabal --force " <> prettyVer v <> "'"
+              pure ExitSuccess
+            VLeft (V (FileAlreadyExistsError fp)) -> do
+              runLogger $ logWarn $
+                "File " <> T.pack fp <> " already exists. Use 'ghcup install cabal --isolate " <> T.pack fp <> " --force ..." <> "' if you want to overwrite."
+              pure $ ExitFailure 3
+            VLeft e -> do
+              runLogger $ do
+                logError $ T.pack $ prettyShow e
+                logError $ "Also check the logs in " <> T.pack logsDir
+              pure $ ExitFailure 4
+
+  installHLS :: InstallOptions -> IO ExitCode
+  installHLS InstallOptions{..} = do
+     s'@AppState{ dirs = Dirs{ .. } } <- liftIO getAppState'
+     (case instBindist of
+       Nothing -> runInstTool s' instPlatform $ do
+         (v, vi) <- liftE $ fromVersion instVer HLS
+         liftE $ installHLSBin
+                   (_tvVersion v)
+                   isolateDir
+                   forceInstall
+         pure vi
+       Just uri -> do
+         runInstTool s'{ settings = settings { noVerify = True}} instPlatform $ do
+           (v, vi) <- liftE $ fromVersion instVer HLS
+           liftE $ installHLSBindist
+                     (DownloadInfo uri Nothing "")
+                     (_tvVersion v)
+                     isolateDir
+                     forceInstall
+           pure vi
+      )
+      >>= \case
+            VRight vi -> do
+              runLogger $ logInfo "HLS installation successful"
+              forM_ (_viPostInstall =<< vi) $ \msg ->
+                runLogger $ logInfo msg
+              pure ExitSuccess
+            VLeft (V (AlreadyInstalled _ v)) -> do
+              runLogger $ logWarn $
+                  "HLS ver "
+                <> prettyVer v
+                <> " already installed; if you really want to reinstall it, you may want to run 'ghcup install hls --force "
+                <> prettyVer v
+                <> "'"
+              pure ExitSuccess
+            VLeft (V (FileAlreadyExistsError fp)) -> do
+              runLogger $ logWarn $
+                "File " <> T.pack fp <> " already exists. Use 'ghcup install hls --isolate " <> T.pack fp <> " --force ..." <> "' if you want to overwrite."
+              pure $ ExitFailure 3
+            VLeft e -> do
+              runLogger $ do
+                logError $ T.pack $ prettyShow e
+                logError $ "Also check the logs in " <> T.pack logsDir
+              pure $ ExitFailure 4
+
+  installStack :: InstallOptions -> IO ExitCode
+  installStack InstallOptions{..} = do
+     s'@AppState{ dirs = Dirs{ .. } } <- liftIO getAppState'
+     (case instBindist of
+        Nothing -> runInstTool s' instPlatform $ do
+          (v, vi) <- liftE $ fromVersion instVer Stack
+          liftE $ installStackBin
+                    (_tvVersion v)
+                    isolateDir
+                    forceInstall
+          pure vi
+        Just uri -> do
+          runInstTool s'{ settings = settings { noVerify = True}} instPlatform $ do
+            (v, vi) <- liftE $ fromVersion instVer Stack
+            liftE $ installStackBindist
+                      (DownloadInfo uri Nothing "")
+                      (_tvVersion v)
+                      isolateDir
+                      forceInstall
+            pure vi
+      )
+      >>= \case
+            VRight vi -> do
+              runLogger $ logInfo "Stack installation successful"
+              forM_ (_viPostInstall =<< vi) $ \msg ->
+                runLogger $ logInfo msg
+              pure ExitSuccess
+            VLeft (V (AlreadyInstalled _ v)) -> do
+              runLogger $ logWarn $
+                "Stack ver " <> prettyVer v <> " already installed; if you really want to reinstall it, you may want to run 'ghcup install stack --force " <> prettyVer v <> "'"
+              pure ExitSuccess
+            VLeft (V (FileAlreadyExistsError fp)) -> do
+              runLogger $ logWarn $
+                "File " <> T.pack fp <> " already exists. Use 'ghcup install stack --isolate " <> T.pack fp <> " --force ..." <> "' if you want to overwrite."
+              pure $ ExitFailure 3
+            VLeft e -> do
+              runLogger $ do
+                logError $ T.pack $ prettyShow e
+                logError $ "Also check the logs in " <> T.pack logsDir
+              pure $ ExitFailure 4
+

app/ghcup/GHCup/OptParse/List.hs

@@ -1,8 +1,11 @@
 {-# LANGUAGE CPP               #-}
 {-# LANGUAGE DataKinds         #-}
+{-# LANGUAGE TypeApplications  #-}
 {-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE RankNTypes #-}
 
@@ -12,10 +15,8 @@ module GHCup.OptParse.List where
 
 
 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 )
@@ -26,8 +27,7 @@ import           Data.Char
 import           Data.List                      ( intercalate, sort )
 import           Data.Functor
 import           Data.Maybe
-import           Data.Time.Calendar             ( Day )
-import           Data.Versions
+import           Data.Versions           hiding ( str )
 import           Data.Void
 import           Options.Applicative     hiding ( style )
 import           Prelude                 hiding ( appendFile )
@@ -53,12 +53,8 @@ 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)
+  }
 
 
 
@@ -67,6 +63,7 @@ data ListOptions = ListOptions
     --[ Parsers ]--
     ---------------
 
+          
 listOpts :: Parser ListOptions
 listOpts =
   ListOptions
@@ -75,7 +72,6 @@ listOpts =
             (eitherReader toolParser)
             (short 't' <> long "tool" <> metavar "<ghc|cabal|hls|stack>" <> help
               "Tool to list versions for. Default is all"
-              <> completer toolCompleter
             )
           )
     <*> optional
@@ -84,53 +80,14 @@ listOpts =
             (  short 'c'
             <> long "show-criteria"
             <> metavar "<installed|set|available>"
-            <> help "Apply filtering criteria, prefix with + or -"
-              <> completer (listCompleter
-                [ "+installed", "+set", "+available", "-installed", "-set", "-available"])
+            <> help "Show only installed/set/available tool versions"
             )
           )
-    <*> 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|]
 
 
     -----------------
@@ -142,18 +99,15 @@ printListResult :: Bool -> Bool -> [ListResult] -> IO ()
 printListResult no_color raw lr = do
 
   let
-    color | raw || no_color = (\_ x -> x)
+    color | raw || no_color = flip const
           | otherwise       = Pretty.color
 
   let
     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
@@ -165,25 +119,29 @@ printListResult no_color raw lr = do
         . fmap
             (\ListResult {..} ->
               let marks = if
-                    | lSet       -> (color Green (if isWindows then "IS" else "✔✔"))
-                    | lInstalled -> (color Green (if isWindows then "I " else "✓ "))
-                    | otherwise  -> (color Red   (if isWindows then "X " else "✗ "))
+#if defined(IS_WINDOWS)
+                    | lSet       -> (color Green "IS")
+                    | lInstalled -> (color Green "I ")
+                    | otherwise  -> (color Red "X ")
+#else
+                    | lSet       -> (color Green "✔✔")
+                    | lInstalled -> (color Green "✓ ")
+                    | otherwise  -> (color Red "✗ ")
+#endif
               in
                 (if raw then [] else [marks])
                   ++ [ fmap toLower . show $ lTool
                      , case lCross of
                        Nothing -> T.unpack . prettyVer $ lVer
                        Just c  -> T.unpack (c <> "-" <> prettyVer lVer)
-                     , intercalate "," (filter (/= "") . fmap printTag $ sort lTag)
+                     , intercalate "," $ (filter (/= "") . fmap printTag $ sort lTag)
                      , intercalate ","
                      $  (if hlsPowered
                           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
@@ -192,11 +150,11 @@ printListResult no_color raw lr = do
             )
         $ lr
   let cols =
-        foldr (\xs ys -> zipWith (:) xs ys) (repeat []) rows
-      lengths = fmap (maximum . fmap strWidth) cols
+        foldr (\xs ys -> zipWith (:) xs ys) (replicate (length rows) []) rows
+      lengths = fmap maximum . (fmap . fmap) strWidth $ cols
       padded  = fmap (\xs -> zipWith padTo xs lengths) rows
 
-  forM_ (if raw then rows else padded) $ \row -> putStrLn $ unwords row
+  forM_ padded $ \row -> putStrLn $ intercalate " " row
  where
 
   padTo str' x =
@@ -308,7 +266,7 @@ list :: ( Monad m
       -> m ExitCode
 list ListOptions{..} no_color runAppState =
   runAppState (do
-      l <- listVersions loTool (maybeToList lCriteria) lHideOld lShowNightly (lFrom, lTo)
+      l <- listVersions loTool lCriteria
       liftIO $ printListResult no_color lRawFormat l
       pure ExitSuccess
     )

app/ghcup/GHCup/OptParse/Nuke.hs

@@ -3,6 +3,9 @@
 {-# LANGUAGE TypeApplications  #-}
 {-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell   #-}
+{-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE RankNTypes #-}
 
@@ -14,7 +17,7 @@ module GHCup.OptParse.Nuke where
 import           GHCup
 import           GHCup.Errors
 import           GHCup.Types
-import           GHCup.Prelude.Logger
+import           GHCup.Utils.Logger
 
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -26,6 +29,7 @@ import           Haskus.Utils.Variant.Excepts
 import           Options.Applicative     hiding ( style )
 import           Prelude                 hiding ( appendFile )
 import           System.Exit
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 
 import qualified Data.Text                     as T
 import Control.Exception.Safe (MonadMask)
@@ -41,11 +45,11 @@ import Control.Concurrent (threadDelay)
     ---------------------------
 
 
-type NukeEffects = '[ NotInstalled, UninstallFailed ]
+type NukeEffects = '[ NotInstalled ]
 
 
 runNuke :: AppState
-        -> Excepts NukeEffects (ReaderT AppState m) a
+        -> (Excepts NukeEffects (ReaderT AppState m) a)
         -> m (VEither NukeEffects a)
 runNuke s' =
   flip runReaderT s' . runE @NukeEffects
@@ -76,8 +80,8 @@ nuke appState runLogger = do
 
        lift $ logInfo "Initiating Nuclear Sequence 🚀🚀🚀"
        lift $ logInfo "Nuking in 3...2...1"
-
-       lInstalled <- lift $ listVersions Nothing [ListInstalled True] False True (Nothing, Nothing)
+  
+       lInstalled <- lift $ listVersions Nothing (Just ListInstalled)
 
        forM_ lInstalled (liftE . rmTool)
 
@@ -94,5 +98,5 @@ nuke appState runLogger = do
                       pure ExitSuccess
 
                 VLeft e -> do
-                  runLogger $ logError $ T.pack $ prettyHFError e
+                  runLogger $ logError $ T.pack $ prettyShow e
                   pure $ ExitFailure 15

app/ghcup/GHCup/OptParse/Prefetch.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE RankNTypes #-}
 
@@ -14,11 +15,9 @@ module GHCup.OptParse.Prefetch where
 import           GHCup
 import           GHCup.Errors
 import           GHCup.Types
-import           GHCup.Types.Optics
-import           GHCup.Prelude.File
-import           GHCup.Prelude.Logger
-import           GHCup.Prelude.String.QQ
+import           GHCup.Utils.Logger
 import           GHCup.OptParse.Common
+import           GHCup.Utils.String.QQ
 
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -31,9 +30,11 @@ import           Haskus.Utils.Variant.Excepts
 import           Options.Applicative     hiding ( style )
 import           Prelude                 hiding ( appendFile )
 import           System.Exit
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 
 import qualified Data.Text                     as T
 import Control.Exception.Safe (MonadMask)
+import GHCup.Utils.Prelude
 import GHCup.Download (getDownloadsF)
 
 
@@ -74,50 +75,50 @@ data PrefetchGHCOptions = PrefetchGHCOptions {
     --[ Parsers ]--
     ---------------
 
-
+          
 prefetchP :: Parser PrefetchCommand
 prefetchP = subparser
   (  command
       "ghc"
-      (info
+      (info 
         (PrefetchGHC
           <$> (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 [] (Just GHC)) )
+                <*> optional (option str (short 'd' <> long "directory" <> help "directory to download into (default: ~/.ghcup/cache/)")))
+          <*> ( optional (toolVersionArgument Nothing (Just GHC)) ))
         ( progDesc "Download GHC assets for installation")
       )
       <>
      command
       "cabal"
-      (info
+      (info 
         (PrefetchCabal
-          <$> fmap PrefetchOptions (optional (option str (short 'd' <> long "directory" <> help "directory to download into (default: ~/.ghcup/cache/)" <> completer (bashCompleter "directory"))))
-          <*> ( optional (toolVersionTagArgument [] (Just Cabal)) <**> helper ))
+          <$> fmap PrefetchOptions (optional (option str (short 'd' <> long "directory" <> help "directory to download into (default: ~/.ghcup/cache/)")))
+          <*> ( optional (toolVersionArgument Nothing (Just Cabal)) <**> helper ))
         ( progDesc "Download cabal assets for installation")
       )
       <>
      command
       "hls"
-      (info
+      (info 
         (PrefetchHLS
-          <$> fmap PrefetchOptions (optional (option str (short 'd' <> long "directory" <> help "directory to download into (default: ~/.ghcup/cache/)" <> completer (bashCompleter "directory"))))
-          <*> ( optional (toolVersionTagArgument [] (Just HLS)) <**> helper ))
+          <$> fmap PrefetchOptions (optional (option str (short 'd' <> long "directory" <> help "directory to download into (default: ~/.ghcup/cache/)")))
+          <*> ( optional (toolVersionArgument Nothing (Just HLS)) <**> helper ))
         ( progDesc "Download HLS assets for installation")
       )
       <>
      command
       "stack"
-      (info
+      (info 
         (PrefetchStack
-          <$> fmap PrefetchOptions (optional (option str (short 'd' <> long "directory" <> help "directory to download into (default: ~/.ghcup/cache/)" <> completer (bashCompleter "directory"))))
-          <*> ( optional (toolVersionTagArgument [] (Just Stack)) <**> helper ))
+          <$> fmap PrefetchOptions (optional (option str (short 'd' <> long "directory" <> help "directory to download into (default: ~/.ghcup/cache/)")))
+          <*> ( optional (toolVersionArgument Nothing (Just Stack)) <**> helper ))
         ( progDesc "Download stack assets for installation")
       )
       <>
      command
       "metadata"
-      (PrefetchMetadata <$ info
+      (const PrefetchMetadata <$> info
         helper
         ( progDesc "Download ghcup's metadata, needed for various operations")
       )
@@ -149,23 +150,19 @@ Examples:
 
 
 type PrefetchEffects = '[ TagNotFound
-                        , DayNotFound
                         , NextVerNotFound
                         , NoToolVersionSet
                         , NoDownload
                         , DigestError
-                        , ContentLengthError
                         , GPGError
                         , DownloadFailed
                         , JSONError
-                        , FileDoesNotExistError
-                        , StackPlatformDetectError
-                        ]
+                        , FileDoesNotExistError ]
 
 
 runPrefetch :: MonadUnliftIO m
             => (ReaderT AppState m (VEither PrefetchEffects a) -> m (VEither PrefetchEffects a))
-            -> Excepts PrefetchEffects (ResourceT (ReaderT AppState m)) a
+            -> (Excepts PrefetchEffects (ResourceT (ReaderT AppState m)) a)
             -> m (VEither PrefetchEffects a)
 runPrefetch runAppState =
   runAppState
@@ -198,27 +195,26 @@ prefetch prefetchCommand runAppState runLogger =
           forM_ pfCacheDir (liftIO . createDirRecursive')
           (v, _) <- liftE $ fromVersion mt GHC
           if pfGHCSrc
-          then liftE $ fetchGHCSrc v pfCacheDir
-          else liftE $ fetchToolBindist v GHC pfCacheDir
-      PrefetchCabal PrefetchOptions {pfCacheDir} mt   -> do
+          then liftE $ fetchGHCSrc (_tvVersion v) pfCacheDir
+          else liftE $ fetchToolBindist (_tvVersion v) GHC pfCacheDir
+      PrefetchCabal (PrefetchOptions {pfCacheDir}) mt   -> do
         forM_ pfCacheDir (liftIO . createDirRecursive')
         (v, _) <- liftE $ fromVersion mt Cabal
-        liftE $ fetchToolBindist v Cabal pfCacheDir
-      PrefetchHLS PrefetchOptions {pfCacheDir} mt   -> do
+        liftE $ fetchToolBindist (_tvVersion v) Cabal pfCacheDir
+      PrefetchHLS (PrefetchOptions {pfCacheDir}) mt   -> do
         forM_ pfCacheDir (liftIO . createDirRecursive')
         (v, _) <- liftE $ fromVersion mt HLS
-        liftE $ fetchToolBindist v HLS pfCacheDir
-      PrefetchStack PrefetchOptions {pfCacheDir} mt   -> do
+        liftE $ fetchToolBindist (_tvVersion v) HLS pfCacheDir
+      PrefetchStack (PrefetchOptions {pfCacheDir}) mt   -> do
         forM_ pfCacheDir (liftIO . createDirRecursive')
         (v, _) <- liftE $ fromVersion mt Stack
-        liftE $ fetchToolBindist v Stack pfCacheDir
+        liftE $ fetchToolBindist (_tvVersion v) Stack pfCacheDir
       PrefetchMetadata -> do
-        pfreq <- lift getPlatformReq
-        _ <- liftE $ getDownloadsF pfreq
+        _ <- liftE $ getDownloadsF
         pure ""
        ) >>= \case
                 VRight _ -> do
                       pure ExitSuccess
                 VLeft e -> do
-                  runLogger $ logError $ T.pack $ prettyHFError e
+                  runLogger $ logError $ T.pack $ prettyShow e
                   pure $ ExitFailure 15

app/ghcup/GHCup/OptParse/Rm.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE RankNTypes #-}
 
@@ -18,9 +19,9 @@ import           GHCup.Errors
 import           GHCup.Types
 import           GHCup.Types.Optics
 import           GHCup.Utils
-import           GHCup.Prelude.Logger
-import           GHCup.Prelude.String.QQ
+import           GHCup.Utils.Logger
 import           GHCup.OptParse.Common
+import           GHCup.Utils.String.QQ
 
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -29,11 +30,12 @@ import           Control.Monad.Reader
 import           Control.Monad.Trans.Resource
 import           Data.Functor
 import           Data.Maybe
-import           Data.Versions
+import           Data.Versions           hiding ( str )
 import           Haskus.Utils.Variant.Excepts
 import           Options.Applicative     hiding ( style )
 import           Prelude                 hiding ( appendFile )
 import           System.Exit
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 
 import qualified Data.Text                     as T
 import Control.Exception.Safe (MonadMask)
@@ -50,7 +52,6 @@ data RmCommand = RmGHC RmOptions
                | RmCabal Version
                | RmHLS Version
                | RmStack Version
-               deriving (Eq, Show)
 
 
 
@@ -62,7 +63,7 @@ data RmCommand = RmGHC RmOptions
 
 data RmOptions = RmOptions
   { ghcVer :: GHCTargetVersion
-  } deriving (Eq, Show)
+  }
 
 
 
@@ -71,7 +72,7 @@ data RmOptions = RmOptions
     --[ Parsers ]--
     ---------------
 
-
+          
 rmParser :: Parser (Either RmCommand RmOptions)
 rmParser =
   (Left <$> subparser
@@ -81,19 +82,19 @@ rmParser =
       <> command
            "cabal"
            (   RmCabal
-           <$> info (versionParser' [ListInstalled True] (Just Cabal) <**> helper)
+           <$> info (versionParser' (Just ListInstalled) (Just Cabal) <**> helper)
                     (progDesc "Remove Cabal version")
            )
       <> command
            "hls"
            (   RmHLS
-           <$> info (versionParser' [ListInstalled True] (Just HLS) <**> helper)
+           <$> info (versionParser' (Just ListInstalled) (Just HLS) <**> helper)
                     (progDesc "Remove haskell-language-server version")
            )
       <> command
            "stack"
            (   RmStack
-           <$> info (versionParser' [ListInstalled True] (Just Stack) <**> helper)
+           <$> info (versionParser' (Just ListInstalled) (Just Stack) <**> helper)
                     (progDesc "Remove stack version")
            )
       )
@@ -103,7 +104,7 @@ rmParser =
 
 
 rmOpts :: Maybe Tool -> Parser RmOptions
-rmOpts tool = RmOptions <$> ghcVersionArgument [ListInstalled True] tool
+rmOpts tool = RmOptions <$> versionArgument (Just ListInstalled) tool
 
 
 
@@ -127,11 +128,11 @@ rmFooter = [s|Discussion:
     ---------------------------
 
 
-type RmEffects = '[ NotInstalled, UninstallFailed ]
+type RmEffects = '[ NotInstalled ]
 
 
 runRm :: (ReaderT env m (VEither RmEffects a) -> m (VEither RmEffects a))
-            -> Excepts RmEffects (ReaderT env m) a
+            -> (Excepts RmEffects (ReaderT env m) a)
             -> m (VEither RmEffects a)
 runRm runAppState =
     runAppState
@@ -151,7 +152,7 @@ rm :: ( Monad m
       , MonadUnliftIO m
       , MonadFail m
       )
-   => Either RmCommand RmOptions
+   => (Either RmCommand RmOptions)
    -> (ReaderT AppState m (VEither RmEffects (Maybe VersionInfo))
        -> m (VEither RmEffects (Maybe VersionInfo)))
    -> (ReaderT LeanAppState m () -> m ())
@@ -171,15 +172,15 @@ rm rmCommand runAppState runLogger = case rmCommand of
         liftE $
           rmGHCVer ghcVer
         GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-        pure (getVersionInfo ghcVer GHC dls)
+        pure (getVersionInfo (_tvVersion ghcVer) GHC dls)
       )
       >>= \case
             VRight vi -> do
-              runLogger $ logGHCPostRm ghcVer
-              postRmLog vi
+              forM_ (_viPostRemove =<< vi) $ \msg ->
+                runLogger $ logInfo msg
               pure ExitSuccess
             VLeft  e -> do
-              runLogger $ logError $ T.pack $ prettyHFError e
+              runLogger $ logError $ T.pack $ prettyShow e
               pure $ ExitFailure 7
 
   rmCabal' tv =
@@ -187,14 +188,15 @@ rm rmCommand runAppState runLogger = case rmCommand of
         liftE $
           rmCabalVer tv
         GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-        pure (getVersionInfo (mkTVer tv) Cabal dls)
+        pure (getVersionInfo tv Cabal dls)
       )
       >>= \case
             VRight vi -> do
-              postRmLog vi
+              forM_ (_viPostRemove =<< vi) $ \msg ->
+                runLogger $ logInfo msg
               pure ExitSuccess
             VLeft  e -> do
-              runLogger $ logError $ T.pack $ prettyHFError e
+              runLogger $ logError $ T.pack $ prettyShow e
               pure $ ExitFailure 15
 
   rmHLS' tv =
@@ -202,14 +204,15 @@ rm rmCommand runAppState runLogger = case rmCommand of
         liftE $
           rmHLSVer tv
         GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-        pure (getVersionInfo (mkTVer tv) HLS dls)
+        pure (getVersionInfo tv HLS dls)
       )
       >>= \case
             VRight vi -> do
-              postRmLog vi
+              forM_ (_viPostRemove =<< vi) $ \msg ->
+                runLogger $ logInfo msg
               pure ExitSuccess
             VLeft  e -> do
-              runLogger $ logError $ T.pack $ prettyHFError e
+              runLogger $ logError $ T.pack $ prettyShow e
               pure $ ExitFailure 15
 
   rmStack' tv =
@@ -217,16 +220,14 @@ rm rmCommand runAppState runLogger = case rmCommand of
         liftE $
           rmStackVer tv
         GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-        pure (getVersionInfo (mkTVer tv) Stack dls)
+        pure (getVersionInfo tv Stack dls)
       )
       >>= \case
             VRight vi -> do
-              postRmLog vi
+              forM_ (_viPostRemove =<< vi) $ \msg ->
+                runLogger $ logInfo msg
               pure ExitSuccess
             VLeft  e -> do
-              runLogger $ logError $ T.pack $ prettyHFError e
+              runLogger $ logError $ T.pack $ prettyShow e
               pure $ ExitFailure 15
 
-  postRmLog vi =
-    forM_ (_viPostRemove =<< vi) $ \msg ->
-      runLogger $ logInfo msg

app/ghcup/GHCup/OptParse/Set.hs

@@ -2,6 +2,8 @@
 {-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE TypeApplications  #-}
 {-# LANGUAGE FlexibleContexts  #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE QuasiQuotes       #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DuplicateRecordFields #-}
@@ -17,8 +19,8 @@ import           GHCup.OptParse.Common
 import           GHCup
 import           GHCup.Errors
 import           GHCup.Types
-import           GHCup.Prelude.Logger
-import           GHCup.Prelude.String.QQ
+import           GHCup.Utils.Logger
+import           GHCup.Utils.String.QQ
 
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -28,18 +30,18 @@ import           Control.Monad.Trans.Resource
 import           Data.Either
 import           Data.Functor
 import           Data.Maybe
-import           Data.Versions
+import           Data.Versions           hiding ( str )
 import           GHC.Unicode
 import           Haskus.Utils.Variant.Excepts
 import           Options.Applicative     hiding ( style )
 import           Options.Applicative.Help.Pretty ( text )
 import           Prelude                 hiding ( appendFile )
 import           System.Exit
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 
 import qualified Data.Text                     as T
 import Data.Bifunctor (second)
 import Control.Exception.Safe (MonadMask)
-import GHCup.Types.Optics
 
 
 
@@ -53,7 +55,6 @@ data SetCommand = SetGHC SetOptions
                 | SetCabal SetOptions
                 | SetHLS SetOptions
                 | SetStack SetOptions
-                deriving (Eq, Show)
 
 
 
@@ -65,7 +66,7 @@ data SetCommand = SetGHC SetOptions
 
 data SetOptions = SetOptions
   { sToolVer :: SetToolVersion
-  } deriving (Eq, Show)
+  }
 
 
 
@@ -74,7 +75,7 @@ data SetOptions = SetOptions
     --[ Parsers ]--
     ---------------
 
-
+          
 setParser :: Parser (Either SetCommand SetOptions)
 setParser =
   (Left <$> subparser
@@ -82,7 +83,7 @@ setParser =
           "ghc"
           (   SetGHC
           <$> info
-                (setOpts GHC <**> helper)
+                (setOpts (Just GHC) <**> helper)
                 (  progDesc "Set GHC version"
                 <> footerDoc (Just $ text setGHCFooter)
                 )
@@ -91,7 +92,7 @@ setParser =
            "cabal"
            (   SetCabal
            <$> info
-                 (setOpts Cabal <**> helper)
+                 (setOpts (Just Cabal) <**> helper)
                  (  progDesc "Set Cabal version"
                  <> footerDoc (Just $ text setCabalFooter)
                  )
@@ -100,7 +101,7 @@ setParser =
            "hls"
            (   SetHLS
            <$> info
-                 (setOpts HLS <**> helper)
+                 (setOpts (Just HLS) <**> helper)
                  (  progDesc "Set haskell-language-server version"
                  <> footerDoc (Just $ text setHLSFooter)
                  )
@@ -109,14 +110,14 @@ setParser =
            "stack"
            (   SetStack
            <$> info
-                 (setOpts Stack <**> helper)
+                 (setOpts (Just Stack) <**> helper)
                  (  progDesc "Set stack version"
                  <> footerDoc (Just $ text setStackFooter)
                  )
            )
       )
     )
-    <|> (Right <$> setOpts GHC)
+    <|> (Right <$> setOpts Nothing)
  where
   setGHCFooter :: String
   setGHCFooter = [s|Discussion:
@@ -137,25 +138,22 @@ setParser =
     Sets the the current haskell-language-server version.|]
 
 
-setOpts :: Tool -> Parser SetOptions
+setOpts :: Maybe Tool -> Parser SetOptions
 setOpts tool = SetOptions <$>
     (fromMaybe SetRecommended <$>
-      optional (setVersionArgument [ListInstalled True] tool))
+      optional (setVersionArgument (Just ListInstalled) tool))
 
-setVersionArgument :: [ListCriteria] -> Tool -> Parser SetToolVersion
+setVersionArgument :: Maybe ListCriteria -> Maybe Tool -> Parser SetToolVersion
 setVersionArgument criteria tool =
   argument (eitherReader setEither)
     (metavar "VERSION|TAG|next"
-    <> completer (tagCompleter tool ["next"])
-    <> (completer . versionCompleter criteria) tool)
+    <> completer (tagCompleter (fromMaybe GHC tool) ["next"])
+    <> foldMap (completer . versionCompleter criteria) tool)
  where
   setEither s' =
         parseSet s'
     <|> second SetToolTag (tagEither s')
-    <|> se s'
-  se s' = case tool of
-           GHC -> second SetGHCVersion (ghcVersionEither s')
-           _   -> second SetToolVersion (toolVersionEither s')
+    <|> second SetToolVersion (tVersionEither s')
   parseSet s' = case fmap toLower s' of
                   "next" -> Right SetNext
                   other  -> Left $ "Unknown tag/version " <> other
@@ -185,12 +183,11 @@ setFooter = [s|Discussion:
 type SetGHCEffects = '[ FileDoesNotExistError
                    , NotInstalled
                    , TagNotFound
-                   , DayNotFound
                    , NextVerNotFound
                    , NoToolVersionSet]
 
 runSetGHC :: (ReaderT env m (VEither SetGHCEffects a) -> m (VEither SetGHCEffects a))
-          -> Excepts SetGHCEffects (ReaderT env m) a
+          -> (Excepts SetGHCEffects (ReaderT env m) a)
           -> m (VEither SetGHCEffects a)
 runSetGHC runAppState =
     runAppState
@@ -200,12 +197,11 @@ runSetGHC runAppState =
 
 type SetCabalEffects = '[ NotInstalled
                         , TagNotFound
-                        , DayNotFound
                         , NextVerNotFound
                         , NoToolVersionSet]
 
 runSetCabal :: (ReaderT env m (VEither SetCabalEffects a) -> m (VEither SetCabalEffects a))
-            -> Excepts SetCabalEffects (ReaderT env m) a
+            -> (Excepts SetCabalEffects (ReaderT env m) a)
             -> m (VEither SetCabalEffects a)
 runSetCabal runAppState =
     runAppState
@@ -215,12 +211,11 @@ runSetCabal runAppState =
 
 type SetHLSEffects = '[ NotInstalled
                       , TagNotFound
-                      , DayNotFound
                       , NextVerNotFound
                       , NoToolVersionSet]
 
 runSetHLS :: (ReaderT env m (VEither SetHLSEffects a) -> m (VEither SetHLSEffects a))
-          -> Excepts SetHLSEffects (ReaderT env m) a
+          -> (Excepts SetHLSEffects (ReaderT env m) a)
           -> m (VEither SetHLSEffects a)
 runSetHLS runAppState =
     runAppState
@@ -230,12 +225,11 @@ runSetHLS runAppState =
 
 type SetStackEffects = '[ NotInstalled
                         , TagNotFound
-                        , DayNotFound
                         , NextVerNotFound
                         , NoToolVersionSet]
 
 runSetStack :: (ReaderT env m (VEither SetStackEffects a) -> m (VEither SetStackEffects a))
-            -> Excepts SetStackEffects (ReaderT env m) a
+            -> (Excepts SetStackEffects (ReaderT env m) a)
             -> m (VEither SetStackEffects a)
 runSetStack runAppState =
     runAppState
@@ -249,36 +243,36 @@ runSetStack runAppState =
     -------------------
 
 
-set :: forall m env.
-       ( Monad m
+set :: forall m . ( Monad m
        , MonadMask m
        , MonadUnliftIO m
        , MonadFail m
-       , HasDirs env
-       , HasLog env
        )
     => Either SetCommand SetOptions
     -> (forall eff . ReaderT AppState m (VEither eff GHCTargetVersion)
         -> m (VEither eff GHCTargetVersion))
-    -> (forall eff. ReaderT env m (VEither eff GHCTargetVersion)
+    -> (forall eff . ReaderT LeanAppState m (VEither eff GHCTargetVersion)
         -> m (VEither eff GHCTargetVersion))
     -> (ReaderT LeanAppState m () -> m ())
     -> m ExitCode
-set setCommand runAppState _ runLogger = case setCommand of
+set setCommand runAppState runLeanAppState 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
-  (Left (SetGHC sopts))   -> setGHC'   sopts
+  (Left (SetGHC sopts)) -> setGHC' sopts
   (Left (SetCabal sopts)) -> setCabal' sopts
-  (Left (SetHLS sopts))   -> setHLS'   sopts
+  (Left (SetHLS sopts)) -> setHLS' sopts
   (Left (SetStack sopts)) -> setStack' sopts
 
  where
   setGHC' :: SetOptions
           -> m ExitCode
-  setGHC' SetOptions{ sToolVer } = runSetGHC runAppState (do
+  setGHC' SetOptions{ sToolVer } =
+    case sToolVer of
+      (SetToolVersion v) -> runSetGHC runLeanAppState (liftE $ setGHC v SetGHCOnly >> pure v)
+      _ -> runSetGHC runAppState (do
           v <- liftE $ fst <$> fromVersion' sToolVer GHC
-          liftE $ setGHC v SetGHCOnly Nothing
+          liftE $ setGHC v SetGHCOnly
         )
       >>= \case
             VRight GHCTargetVersion{..} -> do
@@ -287,58 +281,67 @@ set setCommand runAppState _ runLogger = case setCommand of
                     "GHC " <> prettyVer _tvVersion <> " successfully set as default version" <> maybe "" (" for cross target " <>) _tvTarget
               pure ExitSuccess
             VLeft e -> do
-              runLogger $ logError $ T.pack $ prettyHFError e
+              runLogger $ logError $ T.pack $ prettyShow e
               pure $ ExitFailure 5
 
 
   setCabal' :: SetOptions
             -> m ExitCode
-  setCabal' SetOptions{ sToolVer } = runSetCabal runAppState (do
+  setCabal' SetOptions{ sToolVer } =
+    case sToolVer of
+      (SetToolVersion v) -> runSetCabal runLeanAppState (liftE $ setCabal (_tvVersion v) >> pure v)
+      _ -> runSetCabal runAppState (do
           v <- liftE $ fst <$> fromVersion' sToolVer Cabal
           liftE $ setCabal (_tvVersion v)
           pure v
         )
       >>= \case
-            VRight v -> do
+            VRight GHCTargetVersion{..} -> do
               runLogger
                 $ logInfo $
-                    "Cabal " <> prettyVer (_tvVersion v) <> " successfully set as default version"
+                    "Cabal " <> prettyVer _tvVersion <> " successfully set as default version"
               pure ExitSuccess
             VLeft  e -> do
-              runLogger $ logError $ T.pack $ prettyHFError e
+              runLogger $ logError $ T.pack $ prettyShow e
               pure $ ExitFailure 14
 
   setHLS' :: SetOptions
           -> m ExitCode
-  setHLS' SetOptions{ sToolVer } = runSetHLS runAppState (do
+  setHLS' SetOptions{ sToolVer } =
+    case sToolVer of
+      (SetToolVersion v) -> runSetHLS runLeanAppState (liftE $ setHLS (_tvVersion v) >> pure v)
+      _ -> runSetHLS runAppState (do
           v <- liftE $ fst <$> fromVersion' sToolVer HLS
-          liftE $ setHLS (_tvVersion v) SetHLSOnly Nothing
+          liftE $ setHLS (_tvVersion v)
           pure v
         )
       >>= \case
-            VRight v -> do
+            VRight GHCTargetVersion{..} -> do
               runLogger
                 $ logInfo $
-                    "HLS " <> prettyVer (_tvVersion v) <> " successfully set as default version"
+                    "HLS " <> prettyVer _tvVersion <> " successfully set as default version"
               pure ExitSuccess
             VLeft  e -> do
-              runLogger $ logError $ T.pack $ prettyHFError e
+              runLogger $ logError $ T.pack $ prettyShow e
               pure $ ExitFailure 14
 
 
   setStack' :: SetOptions
             -> m ExitCode
-  setStack' SetOptions{ sToolVer } = runSetStack runAppState (do
+  setStack' SetOptions{ sToolVer } =
+    case sToolVer of
+      (SetToolVersion v) -> runSetStack runLeanAppState (liftE $ setStack (_tvVersion v) >> pure v)
+      _ -> runSetStack runAppState (do
             v <- liftE $ fst <$> fromVersion' sToolVer Stack
             liftE $ setStack (_tvVersion v)
             pure v
           )
       >>= \case
-            VRight v -> do
+            VRight GHCTargetVersion{..} -> do
               runLogger
                 $ logInfo $
-                    "Stack " <> prettyVer (_tvVersion v) <> " successfully set as default version"
+                    "Stack " <> prettyVer _tvVersion <> " successfully set as default version"
               pure ExitSuccess
             VLeft  e -> do
-              runLogger $ logError $ T.pack $ prettyHFError e
+              runLogger $ logError $ T.pack $ prettyShow e
               pure $ ExitFailure 14

app/ghcup/GHCup/OptParse/ToolRequirements.hs

@@ -2,17 +2,19 @@
 {-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE TypeApplications  #-}
 {-# LANGUAGE FlexibleContexts  #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell   #-}
+{-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE QuasiQuotes #-}
 
 module GHCup.OptParse.ToolRequirements where
 
 
 import           GHCup.Errors
 import           GHCup.Types
-import           GHCup.Prelude.Logger
-import           GHCup.Prelude.String.QQ
+import           GHCup.Utils.Logger
 
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -23,53 +25,19 @@ import           Haskus.Utils.Variant.Excepts
 import           Options.Applicative     hiding ( style )
 import           Prelude                 hiding ( appendFile )
 import           System.Exit
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 
 import qualified Data.Text                     as T
 import qualified Data.Text.IO                  as T
 import Control.Exception.Safe (MonadMask)
 import GHCup.Types.Optics
 import GHCup.Platform
-import GHCup.Prelude
+import GHCup.Utils.Prelude
 import GHCup.Requirements
 import System.IO
 
 
 
-    ---------------
-    --[ Options ]--
-    ---------------
-
-
-data ToolReqOpts = ToolReqOpts
-  { tlrRaw :: Bool
-  }
-
-
-
-
-    ---------------
-    --[ Parsers ]--
-    ---------------
-
-          
-toolReqP :: Parser ToolReqOpts
-toolReqP =
-  ToolReqOpts
-    <$> switch (short 'r' <> long "raw-format" <> help "machine-parsable format")
-
-
-
-
-    --------------
-    --[ Footer ]--
-    --------------
-
-
-toolReqFooter :: String
-toolReqFooter = [s|Discussion:
-  Print tool requirements on the current platform.
-  If you want to pass this to your package manage, use '--raw-format'.|]
-
 
 
     ---------------------------
@@ -81,7 +49,7 @@ type ToolRequirementsEffects = '[ NoCompatiblePlatform , DistroNotFound , NoTool
 
 
 runToolRequirements :: (ReaderT env m (VEither ToolRequirementsEffects a) -> m (VEither ToolRequirementsEffects a))
-                    -> Excepts ToolRequirementsEffects (ReaderT env m) a
+                    -> (Excepts ToolRequirementsEffects (ReaderT env m) a)
                     -> m (VEither ToolRequirementsEffects a)
 runToolRequirements runAppState =
     runAppState
@@ -102,20 +70,17 @@ toolRequirements :: ( Monad m
                     , MonadFail m
                     , Alternative m
                     )
-                 => ToolReqOpts
-                 -> (ReaderT AppState m (VEither ToolRequirementsEffects ()) -> m (VEither ToolRequirementsEffects ()))
+                 => (ReaderT AppState m (VEither ToolRequirementsEffects ()) -> m (VEither ToolRequirementsEffects ()))
                  -> (ReaderT LeanAppState m () -> m ())
                  -> m ExitCode
-toolRequirements ToolReqOpts{..} runAppState runLogger = runToolRequirements runAppState (do
+toolRequirements runAppState runLogger = runToolRequirements runAppState (do
     GHCupInfo { .. } <- lift getGHCupInfo
     platform' <- liftE getPlatform
-    req       <- getCommonRequirements platform' _toolRequirements ?? NoToolRequirements
-    if tlrRaw
-    then liftIO $ T.hPutStr stdout (rawRequirements req)
-    else liftIO $ T.hPutStr stdout (prettyRequirements req)
+    req      <- getCommonRequirements platform' _toolRequirements ?? NoToolRequirements
+    liftIO $ T.hPutStr stdout (prettyRequirements req)
   )
     >>= \case
           VRight _ -> pure ExitSuccess
           VLeft  e -> do
-            runLogger $ logError $ T.pack $ prettyHFError e
+            runLogger $ logError $ T.pack $ prettyShow e
             pure $ ExitFailure 12

app/ghcup/GHCup/OptParse/UnSet.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE TypeApplications  #-}
 {-# LANGUAGE FlexibleContexts  #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE QuasiQuotes       #-}
 {-# LANGUAGE OverloadedStrings #-}
@@ -16,8 +17,8 @@ module GHCup.OptParse.UnSet where
 import           GHCup
 import           GHCup.Errors
 import           GHCup.Types
-import           GHCup.Prelude.Logger
-import           GHCup.Prelude.String.QQ
+import           GHCup.Utils.Logger
+import           GHCup.Utils.String.QQ
 
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -31,10 +32,10 @@ import           Options.Applicative     hiding ( style )
 import           Options.Applicative.Help.Pretty ( text )
 import           Prelude                 hiding ( appendFile )
 import           System.Exit
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 
 import qualified Data.Text                     as T
 import Control.Exception.Safe (MonadMask)
-import GHCup.Types.Optics
 
 
 
@@ -48,7 +49,6 @@ data UnsetCommand = UnsetGHC   UnsetOptions
                   | UnsetCabal UnsetOptions
                   | UnsetHLS   UnsetOptions
                   | UnsetStack UnsetOptions
-                  deriving (Eq, Show)
 
 
 
@@ -60,7 +60,7 @@ data UnsetCommand = UnsetGHC   UnsetOptions
 
 data UnsetOptions = UnsetOptions
   { sToolVer :: Maybe T.Text -- target platform triple
-  } deriving (Eq, Show)
+  }
 
 
 
@@ -69,10 +69,10 @@ data UnsetOptions = UnsetOptions
     --[ Parsers ]--
     ---------------
 
-
+          
 unsetParser :: Parser UnsetCommand
 unsetParser =
-  subparser
+  (subparser
       (  command
           "ghc"
           (   UnsetGHC
@@ -110,18 +110,12 @@ unsetParser =
                  )
            )
       )
+    )
  where
   unsetGHCFooter :: String
   unsetGHCFooter = [s|Discussion:
     Unsets the the current GHC version. That means there won't
-    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|]
+    be a ~/.ghcup/bin/ghc anymore.|]
 
   unsetCabalFooter :: String
   unsetCabalFooter = [s|Discussion:
@@ -162,7 +156,7 @@ type UnsetEffects = '[ NotInstalled ]
 
 
 runUnsetGHC :: (ReaderT env m (VEither UnsetEffects a) -> m (VEither UnsetEffects a))
-            -> Excepts UnsetEffects (ReaderT env m) a
+            -> (Excepts UnsetEffects (ReaderT env m) a)
             -> m (VEither UnsetEffects a)
 runUnsetGHC runLeanAppState =
     runLeanAppState
@@ -181,11 +175,9 @@ unset :: ( Monad m
          , MonadMask m
          , MonadUnliftIO m
          , MonadFail m
-         , HasDirs env
-         , HasLog env
          )
       => UnsetCommand
-      -> (ReaderT env m (VEither UnsetEffects ())
+      -> (ReaderT LeanAppState m (VEither UnsetEffects ())
           -> m (VEither UnsetEffects ()))
       -> (ReaderT LeanAppState m () -> m ())
       -> m ExitCode
@@ -196,7 +188,7 @@ unset unsetCommand runLeanAppState runLogger = case unsetCommand of
                 runLogger $ logInfo "GHC successfully unset"
                 pure ExitSuccess
               VLeft  e -> do
-                runLogger $ logError $ T.pack $ prettyHFError e
+                runLogger $ logError $ T.pack $ prettyShow e
                 pure $ ExitFailure 14
   (UnsetCabal (UnsetOptions _)) -> do
     void $ runLeanAppState (VRight <$> unsetCabal)

app/ghcup/GHCup/OptParse/Upgrade.hs

@@ -3,6 +3,9 @@
 {-# LANGUAGE TypeApplications  #-}
 {-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell   #-}
+{-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE RankNTypes #-}
 
@@ -14,8 +17,7 @@ module GHCup.OptParse.Upgrade where
 import           GHCup
 import           GHCup.Errors
 import           GHCup.Types
-import           GHCup.Prelude.File
-import           GHCup.Prelude.Logger
+import           GHCup.Utils.Logger
 
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -28,6 +30,7 @@ import           Haskus.Utils.Variant.Excepts
 import           Options.Applicative     hiding ( style )
 import           Prelude                 hiding ( appendFile )
 import           System.Exit
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 
 import qualified Data.Text                     as T
 import Control.Exception.Safe (MonadMask)
@@ -35,7 +38,7 @@ import System.Environment
 import GHCup.Utils
 import System.FilePath
 import GHCup.Types.Optics
-import Data.Versions
+import Data.Versions         hiding (str)
 
 
 
@@ -50,7 +53,7 @@ import Data.Versions
 data UpgradeOpts = UpgradeInplace
                  | UpgradeAt FilePath
                  | UpgradeGHCupDir
-                 deriving (Eq, Show)
+                 deriving Show
 
 
 
@@ -59,21 +62,19 @@ data UpgradeOpts = UpgradeInplace
     --[ Parsers ]--
     ---------------
 
-
+          
 upgradeOptsP :: Parser UpgradeOpts
 upgradeOptsP =
   flag'
       UpgradeInplace
       (short 'i' <> long "inplace" <> help
-        "Upgrade ghcup in-place"
+        "Upgrade ghcup in-place (wherever it's at)"
       )
-    <|>
-      (   UpgradeAt
+    <|> (   UpgradeAt
         <$> option
               str
               (short 't' <> long "target" <> metavar "TARGET_DIR" <> help
                 "Absolute filepath to write ghcup into"
-                <> completer (bashCompleter "file")
               )
         )
     <|> pure UpgradeGHCupDir
@@ -87,14 +88,12 @@ upgradeOptsP =
 
 
 type UpgradeEffects = '[ DigestError
-                       , ContentLengthError
                        , GPGError
                        , NoDownload
                        , NoUpdate
                        , FileDoesNotExistError
                        , CopyError
                        , DownloadFailed
-                       , ToolShadowed
                        ]
 
 
@@ -117,25 +116,24 @@ runUpgrade runAppState =
 
 
 upgrade :: ( Monad m
-           , MonadMask m
-           , MonadUnliftIO m
-           , MonadFail m
-           )
+         , MonadMask m
+         , MonadUnliftIO m
+         , MonadFail m
+         )
         => UpgradeOpts
         -> Bool
-        -> Bool
-        -> Dirs
         -> (forall a. ReaderT AppState m (VEither UpgradeEffects a) -> m (VEither UpgradeEffects a))
         -> (ReaderT LeanAppState m () -> m ())
         -> m ExitCode
-upgrade uOpts force' fatal Dirs{..} runAppState runLogger = do
+upgrade uOpts force' runAppState runLogger = do
+  VRight Dirs{ .. }  <- runAppState (VRight <$> getDirs)
   target <- case uOpts of
     UpgradeInplace  -> Just <$> liftIO getExecutablePath
     (UpgradeAt p)   -> pure $ Just p
     UpgradeGHCupDir -> pure (Just (binDir </> "ghcup" <> exeExt))
 
   runUpgrade runAppState (do
-    v' <- liftE $ upgradeGHCup target force' fatal
+    v' <- liftE $ upgradeGHCup target force'
     GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
     pure (v', dls)
     ) >>= \case
@@ -151,5 +149,5 @@ upgrade uOpts force' fatal Dirs{..} runAppState runLogger = do
         runLogger $ logWarn "No GHCup update available"
         pure ExitSuccess
       VLeft e -> do
-        runLogger $ logError $ T.pack $ prettyHFError e
+        runLogger $ logError $ T.pack $ prettyShow e
         pure $ ExitFailure 11

app/ghcup/GHCup/OptParse/Whereis.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE RankNTypes #-}
 
@@ -17,9 +18,8 @@ import           GHCup
 import           GHCup.Errors
 import           GHCup.OptParse.Common
 import           GHCup.Types
-import           GHCup.Utils
-import           GHCup.Prelude.Logger
-import           GHCup.Prelude.String.QQ
+import           GHCup.Utils.Logger
+import           GHCup.Utils.String.QQ
 
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -32,8 +32,8 @@ import           Haskus.Utils.Variant.Excepts
 import           Options.Applicative     hiding ( style )
 import           Options.Applicative.Help.Pretty ( text )
 import           Prelude                 hiding ( appendFile )
-import           System.Environment
 import           System.Exit
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 
 import qualified Data.Text                     as T
 import Control.Exception.Safe (MonadMask)
@@ -54,7 +54,6 @@ data WhereisCommand = WhereisTool Tool (Maybe ToolVersion)
                     | WhereisCacheDir
                     | WhereisLogsDir
                     | WhereisConfDir
-                    deriving (Eq, Show)
 
 
 
@@ -67,7 +66,7 @@ data WhereisCommand = WhereisTool Tool (Maybe ToolVersion)
 
 data WhereisOptions = WhereisOptions {
    directory :: Bool
-} deriving (Eq, Show)
+}
 
 
 
@@ -76,14 +75,14 @@ data WhereisOptions = WhereisOptions {
     --[ Parsers ]--
     ---------------
 
-
+          
 whereisP :: Parser WhereisCommand
 whereisP = subparser
-  (commandGroup "Tools locations:" <>
+  (commandGroup "Tools locations:" <> 
     command
       "ghc"
       (WhereisTool GHC <$> info
-        ( optional (toolVersionTagArgument [] (Just GHC)) <**> helper )
+        ( optional (toolVersionArgument Nothing (Just GHC)) <**> helper )
         ( progDesc "Get GHC location"
         <> footerDoc (Just $ text whereisGHCFooter ))
       )
@@ -91,7 +90,7 @@ whereisP = subparser
      command
       "cabal"
       (WhereisTool Cabal <$> info
-        ( optional (toolVersionTagArgument [] (Just Cabal)) <**> helper )
+        ( optional (toolVersionArgument Nothing (Just Cabal)) <**> helper )
         ( progDesc "Get cabal location"
         <> footerDoc (Just $ text whereisCabalFooter ))
       )
@@ -99,7 +98,7 @@ whereisP = subparser
      command
       "hls"
       (WhereisTool HLS <$> info
-        ( optional (toolVersionTagArgument [] (Just HLS)) <**> helper )
+        ( optional (toolVersionArgument Nothing (Just HLS)) <**> helper )
         ( progDesc "Get HLS location"
         <> footerDoc (Just $ text whereisHLSFooter ))
       )
@@ -107,14 +106,14 @@ whereisP = subparser
      command
       "stack"
       (WhereisTool Stack <$> info
-        ( optional (toolVersionTagArgument [] (Just Stack)) <**> helper )
+        ( optional (toolVersionArgument Nothing (Just Stack)) <**> helper )
         ( progDesc "Get stack location"
         <> footerDoc (Just $ text whereisStackFooter ))
       )
       <>
      command
       "ghcup"
-      (WhereisTool GHCup <$> info ( pure Nothing <**> helper ) ( progDesc "Get ghcup location" ))
+      (WhereisTool GHCup <$> info ( (pure Nothing) <**> helper ) ( progDesc "Get ghcup location" ))
     ) <|> subparser ( commandGroup "Directory locations:"
       <>
      command
@@ -223,7 +222,6 @@ type WhereisEffects = '[ NotInstalled
                 , NoToolVersionSet
                 , NextVerNotFound
                 , TagNotFound
-                , DayNotFound
                 ]
 
 
@@ -268,16 +266,9 @@ whereis :: ( Monad m
       -> (ReaderT LeanAppState m () -> m ())
       -> m ExitCode
 whereis whereisCommand whereisOptions runAppState leanAppstate runLogger = do
-  Dirs{ .. }  <- runReaderT getDirs leanAppstate
+  VRight Dirs{ .. }  <- runAppState (VRight <$> getDirs)
   case (whereisCommand, whereisOptions) of
-    (WhereisTool GHCup _, WhereisOptions{..}) -> do
-      loc <- liftIO (getExecutablePath >>= canonicalizePath )
-      if directory
-      then liftIO $ putStr $ takeDirectory loc
-      else liftIO $ putStr loc
-      pure ExitSuccess
-
-    (WhereisTool tool (Just (GHCVersion v)), WhereisOptions{..}) ->
+    (WhereisTool tool (Just (ToolVersion v)), WhereisOptions{..}) ->
       runLeanWhereIs leanAppstate (do
         loc <- liftE $ whereIsTool tool v
         if directory
@@ -289,24 +280,10 @@ whereis whereisCommand whereisOptions runAppState leanAppstate runLogger = do
                 liftIO $ putStr r
                 pure ExitSuccess
               VLeft e -> do
-                runLogger $ logError $ T.pack $ prettyHFError e
-                pure $ ExitFailure 30
-    (WhereisTool tool (Just (ToolVersion v)), WhereisOptions{..}) ->
-      runLeanWhereIs leanAppstate (do
-        loc <- liftE $ whereIsTool tool (mkTVer v)
-        if directory
-        then pure $ takeDirectory loc
-        else pure loc
-        )
-        >>= \case
-              VRight r -> do
-                liftIO $ putStr r
-                pure ExitSuccess
-              VLeft e -> do
-                runLogger $ logError $ T.pack $ prettyHFError e
+                runLogger $ logError $ T.pack $ prettyShow e
                 pure $ ExitFailure 30
 
-    (WhereisTool tool whereVer, WhereisOptions{..}) -> do
+    (WhereisTool tool whereVer, WhereisOptions{..}) ->
       runWhereIs runAppState (do
         (v, _) <- liftE $ fromVersion whereVer tool
         loc <- liftE $ whereIsTool tool v
@@ -319,11 +296,11 @@ whereis whereisCommand whereisOptions runAppState leanAppstate runLogger = do
                 liftIO $ putStr r
                 pure ExitSuccess
               VLeft e -> do
-                runLogger $ logError $ T.pack $ prettyHFError e
+                runLogger $ logError $ T.pack $ prettyShow e
                 pure $ ExitFailure 30
 
     (WhereisBaseDir, _) -> do
-      liftIO $ putStr $ fromGHCupPath baseDir
+      liftIO $ putStr baseDir
       pure ExitSuccess
 
     (WhereisBinDir, _) -> do
@@ -331,13 +308,13 @@ whereis whereisCommand whereisOptions runAppState leanAppstate runLogger = do
       pure ExitSuccess
 
     (WhereisCacheDir, _) -> do
-      liftIO $ putStr $ fromGHCupPath cacheDir
+      liftIO $ putStr cacheDir
       pure ExitSuccess
 
     (WhereisLogsDir, _) -> do
-      liftIO $ putStr $ fromGHCupPath logsDir
+      liftIO $ putStr logsDir
       pure ExitSuccess
 
     (WhereisConfDir, _) -> do
-      liftIO $ putStr $ fromGHCupPath confDir
+      liftIO $ putStr confDir
       pure ExitSuccess

app/ghcup/Main.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 
 
@@ -14,19 +15,16 @@ module Main where
 import           BrickMain                    ( brickMain )
 #endif
 
-import qualified GHCup.GHC as GHC
-import qualified GHCup.HLS as HLS
 import           GHCup.OptParse
 
 import           GHCup.Download
 import           GHCup.Errors
 import           GHCup.Platform
 import           GHCup.Types
-import           GHCup.Types.Optics      hiding ( toolRequirements )
 import           GHCup.Utils
-import           GHCup.Prelude
-import           GHCup.Prelude.Logger
-import           GHCup.Prelude.String.QQ
+import           GHCup.Utils.Logger
+import           GHCup.Utils.Prelude
+import           GHCup.Utils.String.QQ
 import           GHCup.Version
 
 import           Cabal.Plan ( findPlanJson, SearchPlanJson(..) )
@@ -58,11 +56,10 @@ import qualified Data.ByteString               as B
 import qualified Data.Text                     as T
 import qualified Data.Text.IO                  as T
 import qualified Data.Text.Encoding            as E
-import qualified GHCup.Types                   as Types
 
 
 
-toSettings :: Options -> IO (Settings, KeyBindings, UserSettings)
+toSettings :: Options -> IO (Settings, KeyBindings)
 toSettings options = do
   noColor <- isJust <$> lookupEnv "NO_COLOR"
   userConf <- runE @'[ JSONError ] ghcupConfigFile >>= \case
@@ -72,23 +69,19 @@ toSettings options = do
       pure defaultUserSettings
     _ -> do
       die "Unexpected error!"
-  pure $ (\(s', k) -> (s', k, userConf)) $ mergeConf options userConf noColor
+  pure $ mergeConf options userConf noColor
  where
    mergeConf :: Options -> UserSettings -> Bool -> (Settings, KeyBindings)
    mergeConf Options{..} UserSettings{..} noColor =
-     let cache       = fromMaybe (fromMaybe (Types.cache defaultSettings) uCache) optCache
-         metaCache   = fromMaybe (fromMaybe (Types.metaCache defaultSettings) uMetaCache) optMetaCache
-         metaMode    = fromMaybe (fromMaybe (Types.metaMode defaultSettings) uMetaMode) optMetaMode
-         noVerify    = fromMaybe (fromMaybe (Types.noVerify defaultSettings) uNoVerify) optNoVerify
-         verbose     = fromMaybe (fromMaybe (Types.verbose defaultSettings) uVerbose) optVerbose
-         keepDirs    = fromMaybe (fromMaybe (Types.keepDirs defaultSettings) uKeepDirs) optKeepDirs
+     let cache       = fromMaybe (fromMaybe False uCache) optCache
+         noVerify    = fromMaybe (fromMaybe False uNoVerify) optNoVerify
+         verbose     = fromMaybe (fromMaybe False uVerbose) optVerbose
+         keepDirs    = fromMaybe (fromMaybe Errors uKeepDirs) optKeepDirs
          downloader  = fromMaybe (fromMaybe defaultDownloader uDownloader) optsDownloader
          keyBindings = maybe defaultKeyBindings mergeKeys uKeyBindings
-         urlSource   = fromMaybe (fromMaybe (Types.urlSource defaultSettings) uUrlSource) optUrlSource
-         noNetwork   = fromMaybe (fromMaybe (Types.noNetwork defaultSettings) uNoNetwork) optNoNetwork
-         gpgSetting  = fromMaybe (fromMaybe (Types.gpgSetting defaultSettings) uGPGSetting) optGpg
-         platformOverride = optPlatform <|> (uPlatformOverride <|> Types.platformOverride defaultSettings)
-         mirrors  = fromMaybe (Types.mirrors defaultSettings) uMirrors
+         urlSource   = maybe (fromMaybe GHCupURL uUrlSource) OwnSource optUrlSource
+         noNetwork   = fromMaybe (fromMaybe False uNoNetwork) optNoNetwork
+         gpgSetting  = fromMaybe (fromMaybe GPGNone uGPGSetting) optGpg
      in (Settings {..}, keyBindings)
 #if defined(INTERNAL_DOWNLOADER)
    defaultDownloader = Internal
@@ -107,6 +100,7 @@ toSettings options = do
          , bSet = fromMaybe bSet kSet
          , bChangelog = fromMaybe bChangelog kChangelog
          , bShowAllVersions = fromMaybe bShowAllVersions kShowAll
+         , bShowAllTools = fromMaybe bShowAllTools kShowAllTools
          }
 
 
@@ -118,7 +112,7 @@ plan_json = $( do
                              c <- B.readFile fp
                              (Just res) <- pure $ decodeStrict' @Value c
                              pure (fp, T.unpack $ decUTF8Safe' $ encodePretty res))
-                unless (null fp) $ qAddDependentFile fp
+                when (not . null $ fp ) $ qAddDependentFile fp
                 pure . LitE . StringL $ c)
 
 
@@ -130,7 +124,8 @@ main = do
   void enableAnsiSupport
 
   let versionHelp = infoOption
-        ( "The GHCup Haskell installer, version " <> (head . lines $ describe_result)
+        ( ("The GHCup Haskell installer, version " <>)
+          (head . lines $ describe_result)
         )
         (long "version" <> help "Show version" <> hidden)
   let planJson = infoOption
@@ -143,10 +138,7 @@ main = do
         <> hidden
         )
   let listCommands = infoOption
-        ("install set rm install-cabal list"
-          <> " upgrade"
-          <> " compile debug-info tool-requirements changelog"
-        )
+        "install set rm install-cabal list upgrade compile debug-info tool-requirements changelog"
         (  long "list-commands"
         <> help "List available commands for shell completion"
         <> internal
@@ -158,10 +150,11 @@ main = do
   versions. It maintains a self-contained ~/.ghcup directory.
 
 ENV variables:
+  * TMPDIR: where ghcup does the work (unpacking, building, ...)
   * GHCUP_INSTALL_BASE_PREFIX: the base of ghcup (default: $HOME)
   * GHCUP_USE_XDG_DIRS: set to anything to use XDG style directories
 
-Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
+Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
 
   customExecParser
       (prefs showHelpOnError)
@@ -174,10 +167,10 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
           -- create ~/.ghcup dir
           ensureDirectories dirs
 
-          (settings, keybindings, userConf) <- toSettings opt
+          (settings, keybindings) <- toSettings opt
 
           -- logger interpreter
-          logfile <- runReaderT initGHCupFileLogging dirs
+          logfile <- flip runReaderT dirs initGHCupFileLogging
           no_color <- isJust <$> lookupEnv "NO_COLOR"
           let loggerConfig = LoggerConfig
                 { lcPrintDebug = verbose settings
@@ -198,73 +191,53 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
           -------------------------
 
 
-          let appState = do
-                pfreq <- case platformOverride settings of
-                           Just pfreq' -> return pfreq'
-                           Nothing -> (runLogger . runE @'[NoCompatiblePlatform, NoCompatibleArch, DistroNotFound] . liftE $ platformRequest) >>= \case
-                                          VRight r -> pure r
-                                          VLeft e -> do
-                                            runLogger
-                                              (logError $ T.pack $ prettyHFError e)
-                                            exitWith (ExitFailure 2)
+              appState = do
+                pfreq <- (
+                  runLogger . runE @'[NoCompatiblePlatform, NoCompatibleArch, DistroNotFound] . liftE $ platformRequest
+                  ) >>= \case
+                          VRight r -> pure r
+                          VLeft e -> do
+                            runLogger
+                              (logError $ T.pack $ prettyShow e)
+                            exitWith (ExitFailure 2)
 
                 ghcupInfo <-
-                  ( flip runReaderT leanAppstate . runE @'[ContentLengthError, DigestError, DistroNotFound, DownloadFailed, FileDoesNotExistError, GPGError, JSONError, NoCompatibleArch, NoCompatiblePlatform, NoDownload, GHCup.Errors.ParseError, ProcessError, UnsupportedSetupCombo, StackPlatformDetectError] $ do
-                     liftE $ getDownloadsF pfreq
-                  )
+                  ( flip runReaderT leanAppstate
+                    . runE @'[DigestError, GPGError, JSONError , DownloadFailed, FileDoesNotExistError]
+                    $ liftE
+                    $ getDownloadsF
+                    )
                     >>= \case
                           VRight r -> pure r
                           VLeft  e -> do
                             runLogger
-                              (logError $ T.pack $ prettyHFError e)
+                              (logError $ T.pack $ prettyShow e)
                             exitWith (ExitFailure 2)
                 let s' = AppState settings dirs keybindings ghcupInfo pfreq loggerConfig
 
-                race_ (liftIO $ runReaderT cleanupTrash s')
-                      (threadDelay 5000000 >> runLogger (logWarn $ "Killing cleanup thread (exceeded 5s timeout)... please remove leftover files in " <> T.pack (fromGHCupPath recycleDir) <> " manually"))
+                race_ (liftIO $ flip runReaderT s' cleanupTrash)
+                      (threadDelay 5000000 >> runLogger (logWarn $ "Killing cleanup thread (exceeded 5s timeout)... please remove leftover files in " <> T.pack recycleDir <> " manually"))
 
                 case optCommand of
                   Nuke -> pure ()
                   Whereis _ _ -> pure ()
                   DInfo -> pure ()
-                  ToolRequirements _ -> pure ()
+                  ToolRequirements -> pure ()
                   ChangeLog _ -> pure ()
                   UnSet _ -> pure ()
 #if defined(BRICK)
                   Interactive -> pure ()
 #endif
-                  -- check for new tools
-                  _
-                    | Just False <- optVerbose -> pure ()
-                    | otherwise -> lookupEnv "GHCUP_SKIP_UPDATE_CHECK" >>= \case
-                         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
-                             alreadyInstalling' <- alreadyInstalling optCommand newTool
-                             when (not alreadyInstalling') $
-                               case t of
-                                 GHCup -> runLogger $
-                                            logWarn ("New GHCup version available: "
-                                              <> tVerToText l
-                                              <> ". To upgrade, run 'ghcup upgrade'")
-                                 _ -> runLogger $
-                                        logWarn ("New "
-                                          <> T.pack (prettyShow t)
-                                          <> " version available. "
-                                          <> "If you want to install this latest version, run 'ghcup install "
-                                          <> T.pack (prettyShow t)
-                                          <> " "
-                                          <> tVerToText l
-                                          <> "'")
+                  _ -> lookupEnv "GHCUP_SKIP_UPDATE_CHECK" >>= \case
+                         Nothing -> flip runReaderT s' checkForUpdates
                          Just _ -> pure ()
 
                 -- TODO: always run for windows
-                siletRunLogger (flip runReaderT s' $ runE ensureShimGen) >>= \case
+                (siletRunLogger $ flip runReaderT s' $ runE ensureGlobalTools) >>= \case
                   VRight _ -> pure ()
                   VLeft e -> do
                     runLogger
-                      (logError $ T.pack $ prettyHFError e)
+                      (logError $ T.pack $ prettyShow e)
                     exitWith (ExitFailure 30)
                 pure s'
 
@@ -278,8 +251,8 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
 #endif
               runAppState action' = do
                 s' <- liftIO appState
-                runReaderT action' s'
-
+                flip runReaderT s' action'
+                  
 
           -----------------
           -- Run command --
@@ -291,26 +264,23 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
               s' <- appState
               liftIO $ brickMain s' >> pure ExitSuccess
 #endif
-            Install installCommand     -> install installCommand settings appState runLogger
-            InstallCabalLegacy iopts   -> install (Left (InstallCabal iopts)) settings appState runLogger
-            Test testCommand           -> test testCommand settings appState runLogger
-            Set setCommand             -> set setCommand runAppState runLeanAppState runLogger
-            UnSet unsetCommand         -> unset unsetCommand runLeanAppState runLogger
-            List lo                    -> list lo no_color runAppState
-            Rm rmCommand               -> rm rmCommand runAppState runLogger
-            DInfo                      -> dinfo runAppState runLogger
-            Compile compileCommand     -> compile compileCommand settings dirs runAppState runLogger
-            Config configCommand       -> config configCommand settings userConf keybindings runLogger
+            Install installCommand   -> install installCommand settings appState runLogger
+            InstallCabalLegacy iopts -> install (Left (InstallCabal iopts)) settings appState runLogger
+            Set setCommand           -> set setCommand runAppState runLeanAppState runLogger
+            UnSet unsetCommand       -> unset unsetCommand runLeanAppState runLogger
+            List lo                  -> list lo no_color runAppState
+            Rm rmCommand             -> rm rmCommand runAppState runLogger
+            DInfo                    -> dinfo runAppState runLogger
+            Compile compileCommand   -> compile compileCommand settings runAppState runLogger
+            Config configCommand     -> config configCommand settings keybindings runLogger
             Whereis whereisOptions
-                    whereisCommand     -> whereis whereisCommand whereisOptions runAppState leanAppstate runLogger
-            Upgrade uOpts force' fatal -> upgrade uOpts force' fatal dirs runAppState runLogger
-            ToolRequirements topts     -> toolRequirements topts runAppState runLogger
-            ChangeLog changelogOpts    -> changelog changelogOpts runAppState runLogger
-            Nuke                       -> nuke appState runLogger
-            Prefetch pfCom             -> prefetch pfCom runAppState runLogger
-            GC gcOpts                  -> gc gcOpts runAppState runLogger
-            Run runCommand             -> run runCommand appState leanAppstate runLogger
-            PrintAppErrors             -> putStrLn allHFError >> pure ExitSuccess
+                    whereisCommand   -> whereis whereisCommand whereisOptions runAppState leanAppstate runLogger
+            Upgrade uOpts force'     -> upgrade uOpts force' runAppState runLogger
+            ToolRequirements         -> toolRequirements runAppState runLogger
+            ChangeLog changelogOpts  -> changelog changelogOpts runAppState runLogger
+            Nuke                     -> nuke appState runLogger
+            Prefetch pfCom           -> prefetch pfCom runAppState runLogger
+            GC gcOpts                -> gc gcOpts runAppState runLogger
 
           case res of
             ExitSuccess        -> pure ()
@@ -318,61 +288,4 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
 
   pure ()
 
- where
-  alreadyInstalling :: ( HasLog env
-                       , MonadFail m
-                       , MonadReader env m
-                       , HasGHCupInfo env
-                       , HasDirs env
-                       , MonadThrow m
-                       , MonadIO m
-                       , MonadCatch m
-                       )
-                    => Command
-                    -> (Tool, GHCTargetVersion)
-                    -> Excepts
-                         '[ TagNotFound
-                          , DayNotFound
-                          , NextVerNotFound
-                          , NoToolVersionSet
-                          ] m Bool
-  alreadyInstalling (Install (Right InstallOptions{..}))                 (GHC, ver)   = cmp' GHC instVer ver
-  alreadyInstalling (Install (Left (InstallGHC InstallOptions{..})))     (GHC, ver)   = cmp' GHC instVer ver
-  alreadyInstalling (Install (Left (InstallCabal InstallOptions{..})))   (Cabal, ver)    = cmp' Cabal instVer ver
-  alreadyInstalling (Install (Left (InstallHLS InstallOptions{..})))     (HLS, ver)      = cmp' HLS instVer ver
-  alreadyInstalling (Install (Left (InstallStack InstallOptions{..})))   (Stack, ver)    = cmp' Stack instVer ver
-  alreadyInstalling (Compile (CompileGHC GHCCompileOptions{ ovewrwiteVer = Just over }))
-    (GHC, ver)   = cmp' GHC (Just $ GHCVersion (mkTVer over)) ver
-  alreadyInstalling (Compile (CompileGHC GHCCompileOptions{ targetGhc = GHC.SourceDist tver }))
-    (GHC, ver)   = cmp' GHC (Just $ ToolVersion tver) ver
-  alreadyInstalling (Compile (CompileHLS HLSCompileOptions{ ovewrwiteVer = Right over }))
-    (HLS, ver)   = cmp' HLS (Just $ ToolVersion over) ver
-  alreadyInstalling (Compile (CompileHLS HLSCompileOptions{ targetHLS = HLS.SourceDist tver }))
-    (HLS, ver)   = cmp' HLS (Just $ ToolVersion tver) ver
-  alreadyInstalling (Compile (CompileHLS HLSCompileOptions{ targetHLS = HLS.HackageDist tver }))
-    (HLS, ver)   = cmp' HLS (Just $ ToolVersion tver) ver
-  alreadyInstalling (Upgrade {}) (GHCup, _) = pure True
-  alreadyInstalling _ _ = pure False
-
-  cmp' :: ( HasLog env
-          , MonadFail m
-          , MonadReader env m
-          , HasGHCupInfo env
-          , HasDirs env
-          , MonadThrow m
-          , MonadIO m
-          , MonadCatch m
-          )
-       => Tool
-       -> Maybe ToolVersion
-       -> GHCTargetVersion
-       -> Excepts
-            '[ TagNotFound
-             , DayNotFound
-             , NextVerNotFound
-             , NoToolVersionSet
-             ] m Bool
-  cmp' tool instVer ver = do
-    (v, _) <- liftE $ fromVersion instVer tool
-    pure (v == ver)
 

cabal.ghc8107.project

@@ -5,10 +5,10 @@ optional-packages: ./vendored/*/*.cabal
 optimization: 2
 
 package ghcup
+    tests: True
     flags: +tui
 
-constraints: http-io-streams -brotli,
-             any.aeson >= 2.0.1.0
+constraints: http-io-streams -brotli
 
 package libarchive
   flags: -system-libarchive
@@ -19,11 +19,6 @@ package aeson-pretty
 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-8.10.7

cabal.ghc8107.project.freeze

@@ -1,55 +1,49 @@
 active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.6.3.0,
+constraints: any.Cabal ==3.2.1.0 || ==3.6.1.0,
              Cabal -bundled-binary-generic,
-             any.Cabal-syntax ==3.8.1.0,
              any.HUnit ==1.6.2.0,
-             any.HsOpenSSL ==0.11.7.4,
+             any.HsOpenSSL ==0.11.7.2,
              HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
-             any.OneTuple ==0.3.1,
+             any.HsYAML ==0.2.1.0,
+             HsYAML -exe,
+             any.HsYAML-aeson ==0.2.0.0,
              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.1.1.0,
-             aeson -cffi +ordered-keymap,
-             any.aeson-pretty ==0.8.9,
+             any.aeson ==1.5.6.0,
+             aeson -bytestring-builder -cffi -developer -fast,
+             any.aeson-pretty ==0.8.8,
              aeson-pretty +lib-only,
-             any.alex ==3.2.7.1,
-             any.ansi-terminal ==0.11.4,
-             ansi-terminal -example +win32-2-13-1,
+             any.alex ==3.2.6,
+             alex +small_base,
+             any.ansi-terminal ==0.11,
+             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,
+             any.async ==2.2.3,
              async -bench,
-             any.atomic-primops ==0.8.4,
-             atomic-primops -debug,
-             any.attoparsec ==0.14.4,
+             any.attoparsec ==0.13.2.5,
              attoparsec -developer,
              any.base ==4.14.3.0,
-             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.14,
+             any.base-compat ==0.12.0,
+             any.base-compat-batteries ==0.12.0,
+             any.base-orphans ==0.8.5,
+             any.base16-bytestring ==1.0.1.0,
+             any.base64-bytestring ==1.1.0.0,
+             any.bifunctors ==5.5.11,
              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 ==1.5,
+             any.blaze-builder ==0.4.2.1,
+             any.brick ==0.64.1,
              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-install-parsers ==0.5,
-             any.cabal-plan ==0.7.2.3,
+             any.cabal-plan ==0.7.2.0,
              cabal-plan -_ -exe -license-report,
              any.call-stack ==0.4.0,
              any.case-insensitive ==1.2.1.0,
@@ -57,23 +51,24 @@ constraints: any.Cabal ==3.6.3.0,
              any.chs-cabal ==0.1.1.1,
              any.chs-deps ==0.1.0.0,
              chs-deps -cross,
+             any.clock ==0.8.2,
+             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.5.0,
+             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,
+             any.cryptohash-sha1 ==0.11.100.1,
+             any.cryptohash-sha256 ==0.11.102.0,
              cryptohash-sha256 -exe +use-cbits,
-             any.data-array-byte ==0.1.0.1,
-             any.data-clist ==0.2,
+             any.data-clist ==0.1.2.3,
              any.data-fix ==0.3.2,
              any.deepseq ==1.4.4.0,
              any.directory ==1.3.6.0,
@@ -84,128 +79,106 @@ constraints: any.Cabal ==3.6.3.0,
              dlist -werror,
              any.exceptions ==0.10.4,
              any.filepath ==1.4.2.1,
-             any.free ==5.1.10,
-             any.fusion-plugin-types ==0.1.0,
-             any.generic-arbitrary ==0.2.2,
-             any.generically ==0.1,
+             any.free ==5.1.7,
+             any.generic-arbitrary ==0.1.0,
              any.ghc-boot-th ==8.10.7,
              any.ghc-byteorder ==4.11.0.0.10,
              any.ghc-prim ==0.6.1,
              any.happy ==1.20.0,
-             any.hashable ==1.4.2.0,
+             any.hashable ==1.3.3.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.hsc2hs ==0.68.8,
+             any.haskus-utils-variant ==3.1,
+             any.hsc2hs ==0.68.7,
              hsc2hs -in-ghc-tree,
-             any.hspec ==2.10.8,
-             any.hspec-core ==2.10.8,
-             any.hspec-discover ==2.10.8,
+             any.hspec ==2.7.10,
+             any.hspec-core ==2.7.10,
+             any.hspec-discover ==2.7.10,
              any.hspec-expectations ==0.8.2,
              any.hspec-golden-aeson ==0.9.0.0,
-             any.http-io-streams ==0.1.6.1,
+             any.http-io-streams ==0.1.6.0,
              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.1,
+             any.indexed-traversable ==0.1.1,
+             any.indexed-traversable-instances ==0.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.2,
+             any.io-streams ==1.5.2.1,
              io-streams +network -nointeractivetests +zlib,
-             any.language-c ==0.9.2,
+             any.language-c ==0.9.0.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.4,
-             any.lukko ==0.1.1.3,
-             lukko +ofd-locking,
-             any.lzma-static ==5.2.5.5,
-             any.megaparsec ==9.2.1,
+             any.libarchive ==3.0.3.0,
+             libarchive -cross -low-memory -system-libarchive,
+             any.lzma-static ==5.2.5.4,
+             any.megaparsec ==9.0.1,
              megaparsec -dev,
-             any.microlens ==0.4.13.1,
-             any.microlens-mtl ==0.2.0.3,
-             any.microlens-th ==0.4.3.11,
+             any.microlens ==0.4.12.0,
+             any.microlens-mtl ==0.2.0.1,
+             any.microlens-th ==0.4.3.10,
              any.mtl ==2.2.2,
-             any.network ==3.1.2.7,
+             any.network ==3.1.2.2,
              network -devel,
-             any.network-uri ==2.6.4.2,
+             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,
+             any.optics ==0.4,
+             any.optics-core ==0.4,
              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,
+             any.optics-extra ==0.4,
+             any.optics-th ==0.4,
+             any.optparse-applicative ==0.16.1.0,
              optparse-applicative +process,
-             any.os-release ==1.0.2.1,
+             any.os-release ==1.0.2,
              os-release -devel,
              any.parallel ==3.2.2.0,
-             any.parsec ==3.1.16.1,
+             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.primitive ==0.7.2.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.3,
+             any.random ==1.2.1,
+             any.recursion-schemes ==5.2.2.1,
              recursion-schemes +template-haskell,
-             any.regex-base ==0.94.0.2,
+             any.regex-base ==0.94.0.1,
              any.regex-posix ==0.96.0.1,
              regex-posix -_regex-posix-clib,
-             any.resourcet ==1.2.6,
-             any.retry ==0.8.1.2,
-             retry -lib-werror,
+             any.resourcet ==1.2.4.3,
              any.rts ==1.0.1,
              any.safe ==0.3.19,
-             any.safe-exceptions ==0.1.7.3,
+             any.safe-exceptions ==0.1.7.2,
              any.scientific ==0.3.7.0,
              scientific -bytestring-builder -integer-simple,
-             any.semialign ==1.2.0.1,
-             semialign +semigroupoids,
-             any.semigroupoids ==5.3.7,
+             any.semigroupoids ==5.3.5,
              semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
              any.setenv ==0.1.1.3,
-             any.split ==0.2.3.5,
-             any.splitmix ==0.1.0.4,
+             any.split ==0.2.3.4,
+             any.splitmix ==0.1.0.3,
              splitmix -optimised-mixer,
              any.stm ==2.5.0.1,
-             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,
              any.strict-base ==0.4.0.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.3,
+             any.terminal-size ==0.3.2.1,
              any.terminfo ==0.4.1.4,
-             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.12,
+             any.text ==1.2.4.1,
+             any.text-zipper ==0.11,
              any.tf-random ==0.5,
-             any.th-abstraction ==0.4.5.0,
-             any.th-compat ==0.1.4,
+             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.20,
+             any.th-lift-instances ==0.1.18,
              any.these ==1.1.1.1,
              these +assoc,
              any.time ==1.9.3,
@@ -214,16 +187,14 @@ constraints: any.Cabal ==3.6.3.0,
              any.transformers ==0.5.6.2,
              any.transformers-base ==0.4.6,
              transformers-base +orphaninstances,
-             any.transformers-compat ==0.7.2,
+             any.transformers-compat ==0.7,
              transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
-             any.unicode-data ==0.3.1,
-             unicode-data -ucd2haskell,
              any.unix ==2.7.2.2,
-             any.unix-bytestring ==0.3.7.8,
-             any.unix-compat ==0.6,
+             any.unix-bytestring ==0.3.7.3,
+             any.unix-compat ==0.5.3,
              unix-compat -old-time,
              any.unliftio-core ==0.2.0.1,
-             any.unordered-containers ==0.2.19.1,
+             any.unordered-containers ==0.2.14.0,
              unordered-containers -debug,
              any.uri-bytestring ==0.3.3.1,
              uri-bytestring -lib-werror,
@@ -231,16 +202,12 @@ constraints: any.Cabal ==3.6.3.0,
              any.uuid-types ==1.0.5,
              any.vector ==0.12.3.1,
              vector +boundschecks -internalchecks -unsafechecks -wall,
-             any.vector-binary-instances ==0.2.5.2,
-             any.versions ==5.0.4,
-             any.vty ==5.37,
-             any.witherable ==0.4.2,
+             any.versions ==5.0.0,
+             any.vty ==5.33,
              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,
+             any.xor ==0.0.1.0,
+             any.zlib ==0.6.2.3,
              zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
              any.zlib-bindings ==0.1.1.5
-index-state: hackage.haskell.org 2023-01-12T04:22:48Z
+index-state: hackage.haskell.org 2021-10-01T15:16:26Z

cabal.ghc901.project

@@ -0,0 +1,24 @@
+packages: ./ghcup.cabal
+
+optional-packages: ./vendored/*/*.cabal
+
+optimization: 2
+
+package ghcup
+    tests: True
+    flags: +tui
+
+constraints: http-io-streams -brotli
+
+package libarchive
+  flags: -system-libarchive
+
+package aeson-pretty
+  flags: +lib-only
+
+package cabal-plan
+  flags: -exe
+
+allow-newer: base, ghc-prim, template-haskell, language-c
+
+with-compiler: ghc-9.0.1

cabal.ghc901.project.freeze

@@ -0,0 +1,213 @@
+active-repositories: hackage.haskell.org:merge
+constraints: any.Cabal ==3.4.0.0 || ==3.6.1.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.HsYAML ==0.2.1.0,
+             HsYAML -exe,
+             any.HsYAML-aeson ==0.2.0.0,
+             any.QuickCheck ==2.14.2,
+             QuickCheck -old-random +templatehaskell,
+             any.StateVar ==1.2.2,
+             any.aeson ==1.5.6.0,
+             aeson -bytestring-builder -cffi -developer -fast,
+             any.aeson-pretty ==0.8.8,
+             aeson-pretty +lib-only,
+             any.alex ==3.2.6,
+             alex +small_base,
+             any.ansi-terminal ==0.11,
+             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.3,
+             async -bench,
+             any.attoparsec ==0.13.2.5,
+             attoparsec -developer,
+             any.base ==4.15.0.0,
+             any.base-compat ==0.12.0,
+             any.base-compat-batteries ==0.12.0,
+             any.base-orphans ==0.8.5,
+             any.base16-bytestring ==1.0.1.0,
+             any.base64-bytestring ==1.1.0.0,
+             any.bifunctors ==5.5.11,
+             bifunctors +semigroups +tagged,
+             any.binary ==0.8.8.0,
+             any.blaze-builder ==0.4.2.1,
+             any.brick ==0.64.1,
+             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.0,
+             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.2,
+             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.100.1,
+             any.cryptohash-sha256 ==0.11.102.0,
+             cryptohash-sha256 -exe +use-cbits,
+             any.data-clist ==0.1.2.3,
+             any.data-fix ==0.3.2,
+             any.deepseq ==1.4.5.0,
+             any.directory ==1.3.6.1,
+             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.7,
+             any.generic-arbitrary ==0.1.0,
+             any.ghc-bignum ==1.0,
+             any.ghc-boot-th ==9.0.1,
+             any.ghc-byteorder ==4.11.0.0.10,
+             any.ghc-prim ==0.7.0,
+             any.happy ==1.20.0,
+             any.hashable ==1.3.3.0,
+             hashable +integer-gmp -random-initial-seed,
+             any.haskus-utils-data ==1.4,
+             any.haskus-utils-types ==1.5.1,
+             any.haskus-utils-variant ==3.1,
+             any.hsc2hs ==0.68.7,
+             hsc2hs -in-ghc-tree,
+             any.hspec ==2.7.10,
+             any.hspec-core ==2.7.10,
+             any.hspec-discover ==2.7.10,
+             any.hspec-expectations ==0.8.2,
+             any.hspec-golden-aeson ==0.9.0.0,
+             any.http-io-streams ==0.1.6.0,
+             http-io-streams -brotli +fast-xor,
+             any.indexed-profunctors ==0.1.1,
+             any.indexed-traversable ==0.1.1,
+             any.indexed-traversable-instances ==0.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.0.1,
+             language-c -allwarnings +iecfpextension +usebytestrings,
+             any.libarchive ==3.0.3.0,
+             libarchive -cross -low-memory -system-libarchive,
+             any.lzma-static ==5.2.5.4,
+             any.megaparsec ==9.0.1,
+             megaparsec -dev,
+             any.microlens ==0.4.12.0,
+             any.microlens-mtl ==0.2.0.1,
+             any.microlens-th ==0.4.3.10,
+             any.mtl ==2.2.2,
+             any.network ==3.1.2.2,
+             network -devel,
+             any.network-uri ==2.6.4.1,
+             any.openssl-streams ==1.2.3.0,
+             any.optics ==0.4,
+             any.optics-core ==0.4,
+             optics-core -explicit-generic-labels,
+             any.optics-extra ==0.4,
+             any.optics-th ==0.4,
+             any.optparse-applicative ==0.16.1.0,
+             optparse-applicative +process,
+             any.os-release ==1.0.2,
+             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.2.0,
+             any.process ==1.6.11.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,
+             any.recursion-schemes ==5.2.2.1,
+             recursion-schemes +template-haskell,
+             any.regex-base ==0.94.0.1,
+             any.regex-posix ==0.96.0.1,
+             regex-posix -_regex-posix-clib,
+             any.resourcet ==1.2.4.3,
+             any.rts ==1.0,
+             any.safe ==0.3.19,
+             any.safe-exceptions ==0.1.7.2,
+             any.scientific ==0.3.7.0,
+             scientific -bytestring-builder -integer-simple,
+             any.semigroupoids ==5.3.5,
+             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.3,
+             splitmix -optimised-mixer,
+             any.stm ==2.5.0.0,
+             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.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.4,
+             any.text ==1.2.4.1,
+             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.18,
+             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,
+             transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
+             any.unix ==2.7.2.2,
+             any.unix-bytestring ==0.3.7.3,
+             any.unix-compat ==0.5.3,
+             unix-compat -old-time,
+             any.unliftio-core ==0.2.0.1,
+             any.unordered-containers ==0.2.14.0,
+             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.0,
+             any.vty ==5.33,
+             any.word-wrap ==0.5,
+             any.word8 ==0.1.3,
+             any.xor ==0.0.1.0,
+             any.zlib ==0.6.2.3,
+             zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
+             any.zlib-bindings ==0.1.1.5
+index-state: hackage.haskell.org 2021-10-01T15:16:26Z

cabal.project

@@ -2,16 +2,25 @@ packages: ./ghcup.cabal
 
 optional-packages: ./vendored/*/*.cabal
 
+optimization: 2
+
 package ghcup
+    tests: True
     flags: +tui
 
 constraints: http-io-streams -brotli,
+             any.Cabal ==3.4.0.0 || ==3.6.2.0,
              any.aeson >= 2.0.1.0
 
 source-repository-package
-  type: git
-  location: https://github.com/fosskers/versions.git
-  tag: 7bc3355348aac3510771d4622aff09ac38c9924d
+    type: git
+    location: https://github.com/hasufell/aeson-pretty.git
+    tag: e902ab866bb41d990b66af3644aeb352ff7aaf6f
+
+source-repository-package
+    type: git
+    location: https://github.com/hasufell/HsYAML-aeson.git
+    tag: b4b4ab8592918b52a9f2e5bb0c5a795b9721b4f3
 
 package libarchive
   flags: -system-libarchive
@@ -25,8 +34,4 @@ package cabal-plan
 package aeson
   flags: +ordered-keymap
 
-package streamly
-  flags: +use-unliftio
-
-package *
-  test-show-details: direct
+allow-newer: base, ghc-prim, template-haskell, language-c

cabal.project.freeze

@@ -1,2 +1,2 @@
 -- windows picks weird version
-constraints: any.hsc2hs ==0.68.8
+constraints: any.hsc2hs ==0.68.7

cabal.project.release

@@ -1,46 +0,0 @@
-packages: ./ghcup.cabal
-
-optional-packages: ./vendored/*/*.cabal
-
-optimization: 2
-
-package ghcup
-  flags: +tui
-
-if os(linux)
-  if arch(x86_64) || arch(i386)
-    package *
-      ghc-options: -split-sections -optl-static
-elif os(darwin)
-  constraints: zlib +bundled-c-zlib,
-               lzma +static
-elif os(mingw32)
-  constraints: zlib +bundled-c-zlib,
-               lzma +static,
-               text -simdutf,
-			   vty-windows >=0.1.0.3
-elif os(freebsd)
-  constraints: zlib +bundled-c-zlib,
-               zip +disable-zstd
-  package *
-    ghc-options: -split-sections -pgmc clang++14
-
-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
-

cbits/dirutils.c

@@ -1,7 +0,0 @@
-#include "dirutils.h"
-
-unsigned int
-    __posixdir_d_type(struct dirent* d)
-    {
-      return(d -> d_type);
-    }

cbits/dirutils.h

@@ -1,16 +0,0 @@
-#ifndef POSIXPATHS_CBITS_DIRUTILS_H
-#define POSIXPATHS_CBITS_DIRUTILS_H
-
-#include <HsFFI.h>
-#include <stdlib.h>
-#include <dirent.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-
-extern unsigned int
-    __posixdir_d_type(struct dirent* d)
-    ;
-
-#endif

data/config.yaml

@@ -16,11 +16,6 @@ gpg-setting: GPGNone # GPGStrict | GPGLax | GPGNone
 # TUI key bindings,
 # see https://hackage.haskell.org/package/vty-5.31/docs/Graphics-Vty-Input-Events.html#t:Key
 # for possible values.
-# It's also possible to define key+modifier, e.g.:
-#   quit:
-#     Key:
-#       KChar: c
-#     Mods: [MCtrl]
 key-bindings:
   up:
     KUp: []
@@ -41,90 +36,32 @@ key-bindings:
   show-all-tools:
     KChar: 't'
 
-# The caching for the metadata files containing download info, depending on last access time
-# of the file. These usually are in '~/.ghcup/cache/ghcup-<ver>.yaml'.
-meta-cache: 300 # in seconds
-
-# When trying to download ghcup metadata, this option decides what to do
-# when the download fails:
-#   1. Lax: use existing ~/.ghcup/cache/ghcup-<ver>.yaml as fallback (default)
-#   2. Strict: fail hard
-meta-mode: Lax # Strict | Lax
-
-# Where to get GHC/cabal/hls download info/versions from. This is a list that performs
-# union over tool versions, preferring the later entries.
+# Where to get GHC/cabal/hls download info/versions from. For more detailed explanation
+# check the 'URLSource' type in the code.
 url-source:
   ## Use the internal download uri, this is the default
-  - GHCupURL
+  GHCupURL: []
 
-  ## Prefer stack supplied metadata (will still use GHCup metadata for versions not existing in stack metadata)
-  # - StackSetupURL
+  ## Example 1: Read download info from this location instead
+  ## Accepts file/http/https scheme
+  # OwnSource: "file:///home/jule/git/ghcup-hs/ghcup-0.0.3.yaml"
 
-  ## Add pre-release channel
-  # - https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml
-  ## Add nightly channel
-  # - https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-0.0.7.yaml
-  ## Add cross compiler channel
-  # - https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-cross-0.0.8.yaml
-
-  ## Use dwarf bindist for 9.4.7 for ghcup metadata
-  # - ghcup-info:
-  #     ghcupDownloads:
-  #       GHC:
-  #         9.4.7:
-  #           viTags: []
-  #           viArch:
-  #             A_64:
-  #               Linux_UnknownLinux:
-  #                 unknown_versioning:
-  #                   dlUri: https://downloads.haskell.org/ghc/9.4.7/ghc-9.4.7-x86_64-deb10-linux-dwarf.tar.xz
-  #                   dlSubdir:
-  #                     RegexDir: "ghc-.*"
-  #                   dlHash: b261b3438ba455e3cf757f9c8dc3a06fdc061ea8ec287a65b7809e25fe18bad4
-
-  ## for stack metadata and the linux64-tinfo6 bindists, use static alpine for 9.8.1
-  # - setup-info:
-  #     ghc:
-  #       linux64-tinfo6:
-  #         9.8.1:
-  #           url: "https://downloads.haskell.org/~ghc/9.8.1/ghc-9.8.1-x86_64-alpine3_12-linux-static.tar.xz"
-  #           content-length: 229037440
-  #           sha256: b48f3d3a508d0c140d1c801e04afc65e80c0d25e7e939a8a41edb387b26b81b3
-
-# This is a way to override platform detection, e.g. when you're running
-# a Ubuntu derivate based on 18.04, you could do:
-#
-# platform-override:
-#   arch: A_64
-#   platform:
-#     contents: Ubuntu
-#     tag: Linux
-#   version: '18.04'
-platform-override: null
-
-# Support for mirrors. Currently there are 3 hosts you can mirror:
-#   - github.com (for stack and some older HLS versions)
-#   - raw.githubusercontent.com (for the yaml metadata)
-#   - downloads.haskell.org (for everything else)
-#
-# E.g. when we have 'https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-0.0.7.yaml'
-# and the following mirror config
-#
-#  "raw.githubusercontent.com":
-#    authority:
-#      host: "mirror.sjtu.edu.cn"
-#    pathPrefix: "ghcup/yaml"
-#
-# Then the resulting url will be 'https://mirror.sjtu.edu.cn/ghcup/yaml/haskell/ghcup-metadata/master/ghcup-0.0.7.yaml'
-mirrors:
-  "github.com":
-    authority:
-      host: "mirror.sjtu.edu.cn"
-  "raw.githubusercontent.com":
-    authority:
-      host: "mirror.sjtu.edu.cn"
-    pathPrefix: "ghcup/yaml"
-  "downloads.haskell.org":
-    authority:
-      host: "mirror.sjtu.edu.cn"
+  ## Example 2: Add custom tarballs to the default downloads, overwriting duplicate versions
+  # AddSource:
+    # Left:
+      # toolRequirements: {} # this is ignored
+      # ghcupDownloads:
+        # GHC:
+          # 9.10.2:
+            # viTags: []
+            # viArch:
+              # A_64:
+                # Linux_UnknownLinux:
+                  # unknown_versioning:
+                    # dlUri: https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3-x86_64-deb8-linux.tar.bz2
+                    # dlSubdir: ghc-7.10.3
+                    # dlHash: 01cfbad8dff1e8b34a5fdca8caeaf843b56e36af919e29cd68870d2588563db5
 
+  ## Example 3: Add a custom download file to the default downloads, overwriting duplicate versions
+  # AddSource:
+    # Right: "file:///home/jule/git/ghcup-hs/ghcup-custom.yaml"

docker/alpine32/Dockerfile

@@ -1,71 +0,0 @@
-FROM --platform=linux/i386 i386/alpine:3.12
-
-ENV LANG C.UTF-8
-
-RUN apk add --no-cache \
-            curl \
-            gcc \
-            g++ \
-            binutils \
-            binutils-gold \
-			coreutils \
-            bsd-compat-headers \
-            gmp-dev \
-            ncurses-dev \
-            libffi-dev \
-            make \
-            xz \
-            tar \
-            perl \
-            bash \
-            diffutils \
-            git \
-			gzip \
-			gnupg && \
-    apk add --no-cache \
-            zlib \
-            zlib-dev \
-            zlib-static \
-            bzip2 \
-            bzip2-dev \
-            bzip2-static \
-            gmp \
-            gmp-dev \
-            openssl-dev \
-            openssl-libs-static \
-            xz \
-            xz-dev \
-            ncurses-static
-
-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/i386-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 i386-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} && \
-	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
-
-ENV PATH /root/.cabal/bin:/root/.ghcup:/root/.local/bin:$PATH
-

docker/alpine64/Dockerfile

@@ -1,72 +0,0 @@
-FROM alpine:3.12
-
-ENV LANG C.UTF-8
-
-RUN apk add --no-cache \
-            curl \
-            gcc \
-            g++ \
-            binutils \
-            binutils-gold \
-			coreutils \
-            bsd-compat-headers \
-            gmp-dev \
-            ncurses-dev \
-            libffi-dev \
-            make \
-            xz \
-            tar \
-            perl \
-            bash \
-            diffutils \
-            git \
-			gzip \
-			gnupg && \
-    apk add --no-cache \
-            zlib \
-            zlib-dev \
-            zlib-static \
-            bzip2 \
-            bzip2-dev \
-            bzip2-static \
-            gmp \
-            gmp-dev \
-            openssl-dev \
-            openssl-libs-static \
-            xz \
-            xz-dev \
-            ncurses-static
-
-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/x86_64-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 x86_64-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} && \
-	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
-
-ENV PATH /root/.cabal/bin:/root/.ghcup:/root/.local/bin:$PATH
-

docker/arm32v7/buster/Dockerfile

@@ -1,61 +0,0 @@
-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/buster/update_opt.sh

@@ -1,36 +0,0 @@
-#!/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/arm32v7/focal/Dockerfile

@@ -1,61 +0,0 @@
-FROM arm32v7/ubuntu:focal
-
-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-9 clang-9 && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN update_opt.sh 9 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/update_opt.sh

@@ -1,36 +0,0 @@
-#!/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/buster/Dockerfile

@@ -1,61 +0,0 @@
-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

@@ -1,36 +0,0 @@
-#!/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

@@ -1,61 +0,0 @@
-FROM arm64v8/ubuntu:focal
-
-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-9 clang-9 && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN update_opt.sh 9 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/focal/update_opt.sh

@@ -1,36 +0,0 @@
-#!/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/about.md

@@ -42,8 +42,8 @@ All you wanted to know about GHCup.
 
 ## How to help
 
-* if you want to contribute code or documentation, check out the [issue tracker](https://github.com/haskell/ghcup-hs/issues) and the [Development guide](./dev.md)
-* if you want to propose features or write user feedback, feel free to [open a ticket](https://github.com/haskell/ghcup-hs/issues/new)
+* if you want to contribute code or documentation, check out the [issue tracker](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues) and the [Development guide](./dev.md)
+* if you want to propose features or write user feedback, feel free to [open a ticket](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/new?issue)
 * if you want to donate to the project, visit our [opencollective](https://opencollective.com/ghcup#category-CONTRIBUTE) page
 
 ## Design goals
@@ -60,29 +60,6 @@ All you wanted to know about GHCup.
 3. handling cabal projects
 4. being a stack alternative
 
-## Distribution policies
-
-Like most Linux distros and other distribution channels, GHCup also
-follows certain policies. These are as follows:
-
-1. The end-user experience is our primary concern
-    - ghcup in CI systems as a use case is a first class citizen
-2. We strive to collaborate with all maintainers of all the tools we support and maintain a good relationship
-3. We may fix build system or other distribution bugs in upstream bindists
-    - these are always communicated upstream
-4. We may even patch source code of supported tools in very rare cases if that is required to ensure that the end-user experience does not break
-    - we'll first try to upstream any such required patch and request a new release to avoid downstream patching
-    - patches will be communicated to the maintainers either way and we'll strive to get their review
-    - they will also be communicated to the end-user
-    - they will be uploaded along with the bindist
-    - we will avoid maintaining long-running downstream patches (currently zero)
-5. We may add bindists for platforms that upstream does not support
-    - this is currently the case for GHC for e.g. Alpine and possibly FreeBSD in the future
-    - this is currently also the case for stack on darwin M1
-    - we don't guarantee for unofficial bindists that the test suite passes at the moment (this may change in the future)
-6. We GPG sign all the GHCup metadata as well as the unofficial bindists
-    - any trust issues relating to missing checksums or GPG signatures is a bug and given high priority
-
 ## How
 
 Installs a specified GHC version into `~/.ghcup/ghc/<ver>`, and places `ghc-<ver>` symlinks in `~/.ghcup/bin/`.
@@ -97,16 +74,13 @@ cabal-install/HLS/stack are installed in `~/.ghcup/bin/<tool>-<ver>` and have un
 
 ## Known users
 
-* CI:
-    - [Github actions/virtual-environments](https://github.com/actions/virtual-environments)
-    - [Github haskell/actions/setup](https://github.com/haskell/actions/tree/main/setup)
-    - [haskell-ci](https://github.com/haskell-CI/haskell-ci)
+* Github actions:
+	- [actions/virtual-environments](https://github.com/actions/virtual-environments)
+	- [haskell/actions/setup](https://github.com/haskell/actions/tree/main/setup)
 * mirrors:
-    - [sjtug](https://mirror.sjtu.edu.cn/docs/ghcup)
+	- [sjtug](https://mirror.sjtu.edu.cn/docs/ghcup)
 * tools:
-    - [vscode-haskell](https://github.com/haskell/vscode-haskell)
-    - [nvim-lsp-installer](https://github.com/williamboman/nvim-lsp-installer)
-    - [vabal](https://github.com/Franciman/vabal)
+	- [vabal](https://github.com/Franciman/vabal)
 
 ## Known problems
 
@@ -178,11 +152,6 @@ Windows 7 and Powershell 2.0 aren't well supported at the moment, also see:
 
 ## FAQ
 
-### Is ghcup really the main installer?
-
-This is based on the Haskell survey results from 2022, which show that more
-than half of survey participants use GHCup: https://taylor.fausak.me/2022/11/18/haskell-survey-results/
-
 ### Why reimplement stack?
 
 GHCup is not a reimplementation of stack. The only common part is automatic installation of GHC,

docs/css/extra.css

@@ -1,8 +1,5 @@
 :root {
   --theme-purple: #5E5184;
-  --theme-purple-dark: rgba(69, 59, 97, 0.5);
-  --ukraine-top: #0057B8;
-  --ukraine-bottom: #FFD700;
   --link-pink: #9E358F;
 }
 
@@ -111,12 +108,12 @@ body.homepage>div.container div.col-md-9 {
 
 .bg-primary {
   background-image: none;
-  background-color: var(--ukraine-top) !important;
+  background-color: var(--theme-purple) !important;
 }
 
 body .bg-primary {
   background-image: none;
-  background-color: var(--ukraine-top);
+  background-color: var(--theme-purple);
   border: 0px;
 }
 
@@ -128,8 +125,8 @@ body .btn-primary {
 
 .navbar.fixed-top {
   background-image: none;
-  background-color: var(--ukraine-top);
-  border-bottom: 40px solid var(--ukraine-bottom);
+  background-color: var(--theme-purple);
+  border-bottom: 5px solid rgba(69, 59, 97, 0.5);
   padding: 0px;
 }
 

docs/dev.md

@@ -12,7 +12,8 @@ organised tree-ish in `GHCup.Utils` and `GHCup.Utils.*`.
 Anything dealing with ghcup specific directories is in
 `GHCup.Utils.Dirs`.
 
-Download information on where to fetch bindists from is in the [ghcup-metadata](https://github.com/haskell/ghcup-metadata) repository.
+Download information on where to fetch bindists from is in the appropriate
+yaml files: `data/metadata/ghcup-<yaml-ver>.yaml`.
 
 ## Design decisions
 
@@ -65,13 +66,17 @@ Some light suggestions:
 
 ### Adding a new GHC version
 
-Head over to: [https://github.com/haskell/ghcup-metadata#adding-a-new-ghc-version](https://github.com/haskell/ghcup-metadata#adding-a-new-ghc-version)
+1. open the latest `data/metadata/ghcup-<yaml-ver>.yaml`
+2. find the latest ghc version (in yaml tree e.g. `ghcupDownloads -> GHC -> 8.10.7`)
+3. copy-paste it
+4. adjust the version, tags, changelog, source url
+5. adjust the various bindist urls (make sure to also change the yaml anchors)
+6. run `cabal run exe:ghcup-gen -- check          -f data/metadata/ghcup-<yaml-ver>.yaml`
+7. run `cabal run exe:ghcup-gen -- check-tarballs -f data/metadata/ghcup-<yaml-ver>.yaml -u 'ghc-8\.10\.8'`
 
 ### Adding a new CLI command
 
-An example illustration on how to deal with [optparse-applicative](https://hackage.haskell.org/package/optparse-applicative) can be seen here: [https://github.com/haskell/ghcup-hs/commit/c19dd5ee8b2edbaf0336af143f1c75b6f4843e26](https://github.com/haskell/ghcup-hs/commit/c19dd5ee8b2edbaf0336af143f1c75b6f4843e26)
-
-Every subcommand now lives in its own module under [GHCup.OptParse.MyCommand](https://github.com/haskell/ghcup-hs/tree/master/app/ghcup/GHCup/OptParse).
+An example illustration on how to deal with [optparse-applicative](https://hackage.haskell.org/package/optparse-applicative) can be seen here: [https://gitlab.haskell.org/haskell/ghcup-hs/-/commit/c19dd5ee8b2edbaf0336af143f1c75b6f4843e26](https://gitlab.haskell.org/haskell/ghcup-hs/-/commit/c19dd5ee8b2edbaf0336af143f1c75b6f4843e26)
 
 ## Major refactors
 
@@ -84,37 +89,30 @@ Every subcommand now lives in its own module under [GHCup.OptParse.MyCommand](ht
    The major changes here were switching `hpath` library out for `filepath`/`directory` (sadly) and
    introducing a non-unix way of handling processes via the `process` library. It also introduced considerable
    amounts of CPP wrt file handling, installation etc.
-3. This refactor split up the huge `Main.hs` and put every subcommand in its own module: [#212](https://gitlab.haskell.org/haskell/ghcup-hs/-/merge_requests/212)
 
 # Releasing
 
-1. Update version in `ghcup.cabal`
+1. Update version in `ghcup.cabal` and `boostrap-haskell` (`ghver` variable at the top of the script)
 
 2. Update `GHCup.Version` module. `ghcupURL` must only be updated if we change the `GHCupInfo` type or the YAML representation of it. The version of the YAML represents the change increments. `ghcUpVer` is the current application version, read from `ghcup.cabal`.
 
 3. Add ChangeLog entry
 
-4. If a new ghcup yaml version is needed, create one at [ghcup-metadata repo](https://github.com/haskell/ghcup-metadata) and push to a temporary release branch, then update the `data/metadata` submodule in ghcup-hs repo to that branch, so CI can pass
+4. Add/fix downloads in `ghcup-<ver>.yaml` (under `data/metadata`), then verify with `ghcup-gen check -f data/metadata/ghcup-<ver>.yaml` and possibly (example only) `ghcup-gen check-tarballs -f data/metadata/ghcup-<ver>.yaml -u 'ghc-8.10.7'`. Generally, new GHC/cabal/stack/hls versions are only added to the latest yaml file. New GHCup versions are added to all (great care must be taken here to not break the parser... e.g. ARM platforms don't parse in all older formats).
 
 5. Commit and git push with tag. Wait for tests to succeed and release artifacts to build.
 
-6. Download release artifacts and upload them `downloads.haskell.org/~ghcup` along with checksum files (also check `scripts/releasing/pull_release_artifacts.sh` and `scripts/releasing/sftp-upload-artifacts.sh`)
+6. Download release artifacts and upload them `downloads.haskell.org/~ghcup` along with checksum files (`sha256sum --tag * > SHA256SUMS && gpg --detach-sign -u <your-email> SHA256SUMS`)
 
-7. Add ghcup release artifacts to ALL yaml files, see [ghcup-metadata repo](https://github.com/haskell/ghcup-metadata)
+7. Add ghcup release artifacts to ALL yaml files (see point 4.)
 
-8. Upload the final `ghcup-<ver>.yaml` (and a detached GPG sig of it) to `webhost.haskell.org/ghcup/data/` (for yaml versions <= 0.0.6) as well as [https://github.com/haskell/ghcup-metadata](https://github.com/haskell/ghcup-metadata) (for all versions).
+8. Upload the final `data/metadata/ghcup-<ver>.yaml` (and a detached GPG sig of it) to `webhost.haskell.org/ghcup/data/`.
 
-9. Update version in `scripts/bootstrap/bootstrap-haskell` (`ghver` variable at the top of the script)
+9. Update `bootstrap-haskell` and `bootstrap-haskell.ps1` to `webhost.haskell.org/ghcup/sh/`
 
-10. Upload `scripts/bootstrap/bootstrap-haskell` and `scripts/bootstrap/bootstrap-haskell.ps1` to `webhost.haskell.org/ghcup/sh/`
+10. Update the top-level ghcup symlinks at `downloads.haskell.org/~ghcup`
 
-11. Update the top-level ghcup symlinks at `downloads.haskell.org/~ghcup` (see `scripts/releasing/sftp-symlink-artifacts.sh`)
-
-12. Update the `data/metadata` submodule in ghcup-hs repo to master
-
-13. Do hackage release
-
-14. Post on reddit/discourse/etc. and collect rewards
+11. Post on reddit/discourse/etc. and collect rewards
 
 # Documentation
 

docs/guide.md

@@ -1,10 +1,10 @@
 # User Guide
 
-This is a more in-depth guide specific to GHCup. `ghcup --help` is your friend.
+`ghcup --help` is your friend.
 
 ## Basic usage
 
-For the simple, interactive, text-based user interface (TUI), run:
+For the simple interactive TUI (not available on windows), run:
 
 ```sh
 ghcup tui
@@ -32,22 +32,12 @@ ghcup install cabal
 ghcup upgrade
 ```
 
-### Tags and shortcuts
+## Configuration
 
-GHCup has a number of tags and version shortcuts, that can be used as arguments to **install**/**set** etc.
-All of the following are valid arguments to `ghcup install ghc`:
-
-* `latest`, `recommended`
-* `base-4.15.1.0`
-* `9.0.2`, `9.0`, `9`
-
-If the argument is omitted, the default is `recommended`.
-
-Other tags include:
-
-- `prerelease`: a prerelease version
-- `latest-prerelease`: the latest prerelease version
+A configuration file can be put in `~/.ghcup/config.yaml`. The default config file
+explaining all possible configurations can be found in this repo: [config.yaml](https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/data/config.yaml).
 
+Partial configuration is fine. Command line options always override the config file settings.
 
 ## Manpages
 
@@ -56,57 +46,37 @@ For man pages to work you need [man-db](http://man-db.nongnu.org/) as your `man`
 
 ## Shell-completion
 
-Shell completions are in [scripts/shell-completions](https://github.com/haskell/ghcup-hs/tree/master/scripts/shell-completions) directory of this repository.
+Shell completions are in [scripts/shell-completions](https://gitlab.haskell.org/haskell/ghcup-hs/-/tree/master/scripts/shell-completions) directory of this repository.
 
 For bash: install `shell-completions/bash`
 as e.g. `/etc/bash_completion.d/ghcup` (depending on distro)
 and make sure your bashrc sources the startup script
 (`/usr/share/bash-completion/bash_completion` on some distros).
 
-## Portability
+## Compiling GHC from source
 
-`ghcup` is very portable. There are a few exceptions though:
+Compiling from source is supported for both source tarballs and arbitrary git refs. See `ghcup compile ghc --help`
+for a list of all available options.
 
-1. legacy subcommands `ghcup install` (without a tool identifier) and `ghcup install-cabal` may be removed in the future
+If you need to overwrite the existing `build.mk`, check the default files
+in [data/build_mk](https://gitlab.haskell.org/haskell/ghcup-hs/-/tree/master/data/build_mk), copy them somewhere, adjust them and
+pass `--config path/to/build.mk` to `ghcup compile ghc`.
+Common `build.mk` options are explained [here](https://gitlab.haskell.org/ghc/ghc/-/wikis/building/using#build-configuration).
 
-# Configuration
+Make sure your system meets all the [prerequisites](https://gitlab.haskell.org/ghc/ghc/-/wikis/building/preparation).
 
-A configuration file can be put in `~/.ghcup/config.yaml`. The default config file
-explaining all possible configurations can be found in this repo: [config.yaml](https://github.com/haskell/ghcup-hs/blob/master/data/config.yaml).
+### Cross support
 
-Partial configuration is fine. Command line options always override the config file settings.
+ghcup can compile and install a cross GHC for any target. However, this
+requires that the build host has a complete cross toolchain and various
+libraries installed for the target platform.
 
-## Overriding distro detection
+Consult the GHC documentation on the [prerequisites](https://gitlab.haskell.org/ghc/ghc/-/wikis/building/cross-compiling#tools-to-install).
+For distributions with non-standard locations of cross toolchain and
+libraries, this may need some tweaking of `build.mk` or configure args.
+See `ghcup compile ghc --help` for further information.
 
-If you're running e.g. an Ubuntu derivate based on 18.04 and ghcup is picking bindists that
-don't work well, you could do this in `config.yaml`:
-
-```yml
-platform-override:
-  arch: A_64
-  platform:
-    contents: Ubuntu
-    tag: Linux
-  version: '18.04'
-```
-
-## Env variables
-
-This is the complete list of env variables that change GHCup behavior:
-
-* `GHCUP_USE_XDG_DIRS`: see [XDG support](#xdg-support) below
-* `GHCUP_INSTALL_BASE_PREFIX`: the base of ghcup (default: `$HOME`)
-* `GHCUP_CURL_OPTS`: additional options that can be passed to curl
-* `GHCUP_WGET_OPTS`: additional options that can be passed to wget
-* `GHCUP_GPG_OPTS`: additional options that can be passed to gpg
-* `GHCUP_SKIP_UPDATE_CHECK`: Skip the (possibly annoying) update check when you run a command
-* `CC`/`LD` etc.: full environment is passed to the build system when compiling GHC via GHCup
-
-On windows, there's additionally:
-
-* `GHCUP_MSYS2`: Has to point to the root of an existing MSYS2 installation (when installed by GHCup, that's e.g. `C:\ghcup\msys64`). GHCup bootstrap takes care of this usually.
-
-### XDG support
+## XDG support
 
 To enable XDG style directories, set the environment variable `GHCUP_USE_XDG_DIRS` to anything.
 
@@ -120,291 +90,18 @@ Then you can control the locations via XDG environment variables as such:
 **Note that `ghcup` makes some assumptions about structure of files in `XDG_BIN_HOME`. So if you have other tools
 installing e.g. stack/cabal/ghc into it, this will likely clash. In that case consider disabling XDG support.**
 
-## Caching
-
-GHCup has a few caching mechanisms to avoid redownloads. All cached files end up in `~/.ghcup/cache` by default.
-
-### Downloads cache
-
-Downloaded tarballs (such as GHC, cabal, etc.) are not cached by default unless you pass `ghcup --cache` or set caching
-in your [config](#configuration) via `ghcup config set cache true`.
-
-### Metadata cache
-
-The metadata files (also see [github.com/haskell/ghcup-metadata](https://github.com/haskell/ghcup-metadata))
-have a 5 minutes cache per default depending on the last access time of the file. That means if you run
-`ghcup list` 10 times in a row, only the first time will trigger a download attempt.
-
-### Clearing the cache
-
-If you experience problems, consider clearing the cache via `ghcup gc --cache`.
-
-## Metadata
-
-Metadata files are also called release or distribution channels. They describe tool versions, where to download them etc. and
-can be viewed here: [https://github.com/haskell/ghcup-metadata](https://github.com/haskell/ghcup-metadata).
-
-See the [description](https://github.com/haskell/ghcup-metadata#metadata-variants-distribution-channels)
-of metadata files to understand their purpose. These can be combined.
-
-For example, if you want access to both prerelease and cross bindists, you'd do:
-
-```sh
-ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml
-ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-cross-0.0.8.yaml
-```
-
-This results in the following configuration in `~/.ghcup/config.yaml`:
-
-```yaml
-url-source:
-# the base url that contains all the release bindists
-- GHCupURL
-# prereleases
-- https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml
-# cross bindists
-- https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-cross-0.0.8.yaml
-```
-
-You can add as many channels as you like. They are combined under *Last*, so versions from the prerelease channel
-here overwrite the default ones, if any.
-
-To remove the channel, delete the entire `url-source` section or set it back to the default:
-
-```yml
-url-source:
-  - GHCupURL
-```
-
-Also see [config.yaml](https://github.com/haskell/ghcup-hs/blob/master/data/config.yaml)
-for more options.
-
-You can also use an alternative metadata via one-shot cli option:
-
-```sh
-ghcup --url-source=https://some-url/ghcup-0.0.8.yaml tui
-```
-
-One main caveat of using URLs is that you might need to check whether there are new versions
-of the file (e.g. `ghcup-0.0.7.yaml` vs `ghcup-0.0.8.yaml`). Although old metadata files
-are supported for some time, they are not so indefinitely.
-
-### Mirrors
-
-Metadata files can also be used to operate 3rd party mirrors, in which case you want to use
-a URL instead of the `GHCupURL` alias. E.g. in `~/.ghcup/config.yaml`, you'd do:
-
-```yml
-url-source:
-  - https://mirror.sjtu.edu.cn/ghcup/yaml/ghcup/data/ghcup-0.0.6.yaml
-```
-
-Note that later versions of GHCup allow more sophisticated mirror support, see [here](./#mirrors-proper).
-
-#### 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)
-
-### Git based metadata config
-
-If you don't like the way ghcup updates its metadata with caching and fetching via curl, you can also do as follows:
-
-Clone the metadata git repo:
-
-```sh
-mkdir -p /home/user/git/
-cd /home/user/git/
-git clone -b master https://github.com/haskell/ghcup-metadata.git
-```
-
-Then tell ghcup to use file locations in `~/.ghcup/config.yaml`, e.g.:
-
-```yaml
-url-source:
-- file:///home/user/git/ghcup-metadata/ghcup-0.0.8.yaml
-- file:///home/user/git/ghcup-metadata/ghcup-cross-0.0.8.yaml
-- file:///home/user/git/ghcup-metadata/ghcup-prereleases-0.0.8.yaml
-```
-
-Now, if you invoke `ghcup tui`, it will open instantly without any download, since it just
-reads the metadata from local disk.
-
-You'll have to update the metadata manually though, like so:
-
-```sh
-cd /home/user/git/
-git pull --ff-only origin master
-```
-
-## Stack integration
-
-Stack manages GHC versions internally by default. In order to make it use ghcup installed
-GHC versions there are two strategies.
-
-### Strategy 1: Stack hooks (new, recommended)
-
-Since stack 2.9.1 you can customize the installation logic of GHC completely, see [https://docs.haskellstack.org/en/stable/yaml_configuration/#ghc-installation-customisation](https://docs.haskellstack.org/en/stable/yaml_configuration/#ghc-installation-customisation).
-
-We can use this to simply invoke ghcup whenever stack is trying to install/discover a GHC versions. This
-is done via placing a shell script at `~/.stack/hooks/ghc-install.sh` and making it executable.
-
-The ghcup bootstrap script asks you during installation whether you want to install this shell script. You can also
-install/update it manually like so:
-
-```sh
-mkdir -p ~/.stack/hooks/
-curl https://raw.githubusercontent.com/haskell/ghcup-hs/master/scripts/hooks/stack/ghc-install.sh \
-  > ~/.stack/hooks/ghc-install.sh
-chmod +x ~/.stack/hooks/ghc-install.sh
-# hooks are only run when 'system-ghc: false'
-stack config set system-ghc false --global
-```
-
-By default, when the hook fails for whatever reason, stack will fall back to its own installation logic. To disable
-this, run `stack config set install-ghc false --global`.
-
-### Strategy 2: System GHC (works on all stack versions)
-
-You can instruct stack to use "system" GHC versions (whatever is in PATH). To do so,
-run the following commands:
-
-```sh
-stack config set install-ghc false --global
-stack config set system-ghc  true  --global
-```
-
-### Using stack's setup-info metadata to install GHC
-
-You can now use stack's [setup-info metadata](https://github.com/commercialhaskell/stackage-content/blob/master/stack/stack-setup-2.yaml)
-to install GHC. For that, you can invoke ghcup like so as a shorthand:
-
-```sh
-# ghcup will only see GHC now
-ghcup -s StackSetupURL install ghc 9.4.7
-# this combines both ghcup and stack metadata
-ghcup -s '["GHCupURL", "StackSetupURL"]' install ghc 9.4.7
-```
-
-To make this permanent and combine it with the GHCup metadata, you can add the following to your `~/.ghcup/config.yaml`:
-
-```yaml
-url-source:
-  - GHCupURL
-  # stack versions take precedence
-  # you'll still have access to GHCup provided versions and tools in case they don't exist in stack metadata
-  - StackSetupURL
-```
-
-You can customize or add sections to the setup-info similar to how the [stack documentation](https://docs.haskellstack.org/en/stable/yaml_configuration/#setup-info) explains it. E.g. to change the 9.4.7 bindist, you might do:
-
-```yaml
-url-source:
-  - GHCupURL
-  - StackSetupURL
-  - setup-info:
-      ghc:
-        linux64-tinfo6:
-          9.4.7:
-            url: "https://downloads.haskell.org/~ghc/9.4.7/ghc-9.4.7-x86_64-fedora27-linux.tar.xz"
-            content-length: 179117892
-            sha256: 216b76b7c6383e6ad9ba82533f323f8550e52893a8b9fa33c7b9dc4201ac766a
-```
-
-#### Caveats
-
-The main caveat with using this method is that there's no guarantee that GHCup will pick a compatible HLS bindist
-when you try to install HLS.
-
-Another potential usability issue is that the `latest` and `recommended` shorthands won't work anymore, since
-Stack metadata doesn't have a concept of those and we don't try to be smart when combining the metadatas.
-
-### Windows
-
-On windows, you may find the following config options useful too:
-`skip-msys`, `extra-path`, `extra-include-dirs`, `extra-lib-dirs`.
-
-Also check out: [https://docs.haskellstack.org/en/stable/yaml_configuration](https://docs.haskellstack.org/en/stable/yaml_configuration)
-
-## Mirrors (proper)
-
-Mirrors are now supported via configuration, instead of specifying alternative metadata files.
-
-As an example, this would be a complete mirror configuration in `~/.ghcup/config.yaml`:
-
-```yaml
-mirrors:
-  # yaml download location, would result in:
-  #      https://raw.githubusercontent.com/haskell/ghcup-metadata/develop/ghcup-0.0.8.yaml
-  #   -> https://mirror.sjtu.edu.cn/ghcup/yaml/haskell/ghcup-metadata/master/ghcup-0.0.8.yaml
-  "raw.githubusercontent.com":
-    authority:
-      host: "mirror.sjtu.edu.cn"
-    pathPrefix: "ghcup/yaml"
-  # for stack and some older HLS versions, would result in e.g.
-  #      https://github.com/haskell/haskell-language-server/releases/download/1.2.0/haskell-language-server-Windows-1.2.0.tar.gz
-  #   -> https://mirror.sjtu.edu.cn/ghcup/github/haskell/haskell-language-server/releases/download/1.2.0/haskell-language-server-Windows-1.2.0.tar.gz
-  "github.com":
-    authority:
-      host: "mirror.sjtu.edu.cn"
-    pathPrefix: "ghcup/github"
-  # for all haskell.org hosted bindists, would result in e.g.
-  #      https://downloads.haskell.org/~ghc/9.8.1/ghc-9.8.1-x86_64-deb10-linux.tar.xz
-  #   -> https://mirror.sjtu.edu.cn/ghcup/haskell-downloads/~ghc/9.8.1/ghc-9.8.1-x86_64-deb10-linux.tar.xz
-  "downloads.haskell.org":
-    authority:
-      host: "mirror.sjtu.edu.cn"
-    pathPrefix: "downloads.haskell.org"
-```
-
-The configuration depends on the host of the mirror and they have to provide the correct configuration.
-
-# More on installation
-
-## Customisation of the installation scripts
-
-The scripts offered to install GHCup are available here:
-
-* [bootstrap-haskell](https://github.com/haskell/ghcup-hs/blob/master/scripts/bootstrap/bootstrap-haskell#L7)
-  for Unix-like operating systems
-* [bootstrap-haskell.ps1](https://github.com/haskell/ghcup-hs/blob/master/scripts/bootstrap/bootstrap-haskell.ps1)
-  for Windows (PowerShell). This will, in turn, run the final bootstrap script
-  (by default, that for the Unix-like operating systems).
-
-The effect of the scripts can be customised by setting one or more
-`BOOTSTRAP_HASKELL_*` environment variables (as set out in the first script)
-and, in the case of Windows, by specifying parameters (as set out in the
-PowerShell script).
-
-For example, you can toggle:
-
-* non-interactive installation
-* a more verbose installation
-* whether to install only GHCup (and, on Windows, MSYS2)
-* not to trigger the upgrade of GHCup
-* whether to install the latest version of HLS
-* whether to install the latest version of Stack
-* whether to respect the XDG Base Directory Specification
-* whether to adjust (prepend) the PATH in `bashrc`
-* on Windows, whether to adjust MINGW paths in `cabal.config`
-
-You can also specify:
-
-* the GHC version to install
-* the Cabal version to install
-* which downloader to use (the default is `curl`)
-* the base URL for the download of the GHCup binary distribution
-
-On Windows, you can also use the parameters to:
-
-* toggle whether to overwrite a previous installation
-* specify the GHCup installation root directory
-* specify the Cabal root directory
-* specify the directory of an existing installation of MSYS2 (for example,
-  the one supplied by Stack)
-* specify the URL of the final bootstrap script
-* toggle whether to run the final bootstrap script via `bash` (instead of in a
-  new MSYS2 shell)
+## Env variables
+
+This is the complete list of env variables that change GHCup behavior:
+
+* `GHCUP_USE_XDG_DIRS`: see [XDG support](#xdg-support) above
+* `TMPDIR`: where ghcup does the work (unpacking, building, ...)
+* `GHCUP_INSTALL_BASE_PREFIX`: the base of ghcup (default: `$HOME`)
+* `GHCUP_CURL_OPTS`: additional options that can be passed to curl
+* `GHCUP_WGET_OPTS`: additional options that can be passed to wget
+* `GHCUP_GPG_OPTS`: additional options that can be passed to gpg
+* `GHCUP_SKIP_UPDATE_CHECK`: Skip the (possibly annoying) update check when you run a command
+* `CC`/`LD` etc.: full environment is passed to the build system when compiling GHC via GHCup
 
 ## Installing custom bindists
 
@@ -413,8 +110,7 @@ There are a couple of good use cases to install custom bindists:
 1. manually built bindists (e.g. with patches)
     - example: `ghcup install ghc -u 'file:///home/mearwald/tmp/ghc-eff-patches/ghc-8.10.2-x86_64-deb10-linux.tar.xz' 8.10.2-eff`
 2. GHC head CI bindists
-    - example specifying a branch (`master`): `ghcup install ghc -u 'https://gitlab.haskell.org/ghc/ghc/-/jobs/artifacts/master/raw/ghc-x86_64-linux-fedora33-release.tar.xz?job=x86_64-linux-fedora33-release' head`
-    - example specifying a job id (`1129565`): `ghcup install ghc -u ' https://gitlab.haskell.org/api/v4/projects/1/jobs/1129565/artifacts/ghc-x86_64-linux-alpine3_12-validate+fully_static.tar.xz' mr7847`
+    - example: `ghcup install ghc -u 'https://gitlab.haskell.org/api/v4/projects/1/jobs/artifacts/master/raw/ghc-x86_64-fedora27-linux.tar.xz?job=validate-x86_64-linux-fedora27' head`
 3. DWARF bindists
     - example: `ghcup install ghc -u 'https://downloads.haskell.org/~ghc/8.10.2/ghc-8.10.2-x86_64-deb10-linux-dwarf.tar.xz' 8.10.2-dwarf`
 
@@ -423,163 +119,8 @@ and produce the binaries `ghc-8.10.2-eff` and `ghc-head` respectively.
 GHCup always needs to know which version the bindist corresponds to (this is not automatically
 detected).
 
-## Compiling from source
-
-### GHC
-
-Compiling from source is supported for both source tarballs and arbitrary git refs. See `ghcup compile ghc --help`
-for a list of all available options.
-
-If you need to overwrite the existing `build.mk`, check the default files
-in [data/build_mk](https://github.com/haskell/ghcup-hs/tree/master/data/build_mk), copy them somewhere, adjust them and
-pass `--config path/to/build.mk` to `ghcup compile ghc`.
-Common `build.mk` options are explained [here](https://gitlab.haskell.org/ghc/ghc/-/wikis/building/using#build-configuration).
-
-Make sure your system meets all the [prerequisites](https://gitlab.haskell.org/ghc/ghc/-/wikis/building/preparation).
-
-### HLS
-
-There are 3 main ways to compile HLS from source.
-
-1. from hackage (should have up to date version bounds)
-    - `ghcup compile hls --version 1.7.0.0 --ghc 9.2.3`
-2. from git (allows to build latest sources and PRs)
-    - `ghcup compile hls --git-ref master --ghc 9.2.3`
-    - `ghcup compile hls --git-ref a32db0b --ghc 9.2.3`
-    - `ghcup compile hls --git-ref 1.7.0.0 --ghc 9.2.3`
-3. from source distribution that's packaged during release from the corresponding git sources
-    - `ghcup compile hls --source-dist 1.7.0.0 --ghc 9.2.3`
-
-All these use `cabal v2-install` under the hood, so all build components are cached.
-You can pass arbitrary arguments to cabal, e.g. set the index state like so:
-
-```sh
-ghcup compile hls --git-ref master --ghc 9.2.3 -- --index-state=2022-06-12T00:00:00Z --allow-newer
-```
-
-You can pass `--ghc <ver>` multiple times to install for many GHCs at once.
-
-When building from git sources, ghcup will auto-detect the HLS version that the git commit corresponds to
-from the `haskell-language-server.cabal` file. This version might not have been updated since the last release.
-If you want to avoid overwriting the existing installed HLS version, you can instruct ghcup to use `git describe`
-to set the HLS version instead:
-
-```sh
-ghcup compile hls --git-ref master --ghc 9.2.3 --git-describe-version
-```
-
-You can also set the version explicitly:
-
-```sh
-ghcup compile hls --git-ref master --ghc 9.2.3 --overwrite-version 1.7.0.0-p1
-```
-
-To instruct cabal to run `cabal update` before building, run `ghcup compile hls --version 1.7.0.0 --ghc 9.2.3 --cabal-update`
-
-As always, check `ghcup compile hls --help`.
-
-#### Updating HLS for a new GHC version
-
-First try to build from hackage with some tricks:
-
-```sh
-ghcup compile hls --version 1.7.0.0 --ghc 9.2.4 --cabal-update -- --allow-newer --index-state=2022-06-12T00:00:00Z
-```
-
-This augments the currently installed 1.7.0.0 official bindists in ghcup with new GHC versions support.
-
-If that fails (since `--allow-newer` is quite brutal), you can install from HLS master branch (which may contain new fixes) like so:
-```
-ghcup compile hls --git-ref master --git-describe-version --ghc 8.10.7 --ghc 9.2.4 --cabal-update
-```
-
-This however will create a new HLS version in ghcup, e.g. `1.7.0.0-105-gdc682ba1`, for both 8.10.7 and 9.2.4. If you want to switch back to the official bindists, run `ghcup set hls 1.7.0.0`.
-
-## Cross support
-
-ghcup can compile a cross GHC for any target. However, this
-requires that the build host has a complete cross toolchain and various
-libraries installed for the target platform.
-
-Consult the GHC documentation on the [prerequisites](https://gitlab.haskell.org/ghc/ghc/-/wikis/building/cross-compiling#tools-to-install).
-For distributions with non-standard locations of cross toolchain and
-libraries, this may need some tweaking of `build.mk` or configure args.
-See `ghcup compile ghc --help` for further information.
-
-Since ghcup version 0.1.20.0, we provide cross bindists for GHC JS and WASM. These can be installed conveniently.
-However, these are intended as a developer preview only. By using these GHC variants, you are implicitly signing up to participate in GHC development!
-If you run into bugs or missing behavior, join the dev chat at https://matrix.to/#/#GHC:matrix.org. 
-
-First, add the cross release channel:
-
-```sh
-ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/develop/ghcup-cross-0.0.8.yaml
-```
-
-The next sections explain how to install each cross bindist.
-
-### GHC JS cross bindists (experimental)
-
-You need the required emscripten JS toolchain:
-
-```sh
-git clone https://github.com/emscripten-core/emsdk.git
-cd emsdk
-./emsdk install latest
-./emsdk activate latest
-source ./emsdk_env.sh
-```
-
-Instructions are also here: [Download and install — Emscripten 3.1.43-git (dev) documentation](https://emscripten.org/docs/getting_started/downloads.html).
-
-To install we need to invoke ghcup like so:
-
-```sh
-emconfigure ghcup install ghc --set javascript-unknown-ghcjs-9.6.2
-```
-
-You'll now have the compiler `javascript-unknown-ghcjs-ghc`. To build a hello world, do e.g.:
-
-```sh
-echo 'main = putStrLn "hello world"' > hello.hs
-javascript-unknown-ghcjs-ghc -fforce-recomp hello.hs
-./hello
-```
-
-You can follow the instructions [here](https://gitlab.haskell.org/ghc/ghc/-/wikis/javascript-backend/building#compiling-hello-world).
-
-### GHC WASM cross bindists (experimental)
-
-You need the required wasm toolchain:
-
-```sh
-git clone https://gitlab.haskell.org/ghc/ghc-wasm-meta.git
-cd ghc-wasm-meta/
-export SKIP_GHC=yes
-./setup.sh
-source ~/.ghc-wasm/env
-```
-
-To install, we need to invoke ghcup like so also passing the `--host=<host>` flag (adjust as needed):
-
-```sh
-ghcup install ghc --set wasm32-wasi-9.6.3.20230927 -- --host=x86_64-linux --with-intree-gmp --with-system-libffi
-```
-
-Also check the documentation here: [Glasgow Haskell Compiler / ghc-wasm-meta](https://gitlab.haskell.org/ghc/ghc-wasm-meta).
-
-You'll now have the compiler `wasm32-wasi-ghc`. To build a hello world, do e.g.:
-
-```sh
-echo 'main = putStrLn "hello world"' > hello.hs
-wasm32-wasi-ghc hello.hs -o hello.wasm
-wasmtime ./hello.wasm
-```
-
 ## Isolated installs
 
-**Before using isolated installs, make sure to have at least GHCup version 0.1.17.8!**
-
 Ghcup also enables you to install a tool (GHC, Cabal, HLS, Stack) at an isolated location of your choosing.
 These installs, as the name suggests, are separate from your main installs and DO NOT conflict with them.
 
@@ -592,87 +133,101 @@ You need to use the `--isolate` or `-i` flag followed by the directory path.
 
 Examples:
 
-1. install an isolated GHC version at location /home/user/isolated_dir/ghc/
+1. install an isolated GHC version at location /home/user/isolated_dir/ghc/  
     - `ghcup install ghc 8.10.5 --isolate /home/user/isolated_dir/ghc`
 
-2. isolated install Cabal at a location you desire
+2. isolated install Cabal at a location you desire  
     - `ghcup install cabal --isolate /home/username/my_isolated_dir/`
 
-3. do an isolated install with a custom bindist
-    - `ghcup install ghc --isolate /home/username/my_isolated_dir/ -u 'https://gitlab.haskell.org/ghc/ghc/-/jobs/artifacts/master/raw/ghc-x86_64-linux-fedora33-release.tar.xz?job=x86_64-linux-fedora33-release' head`
+3. do an isolated install with a custom bindist  
+    - `ghcup install ghc --isolate /home/username/my_isolated_dir/ -u 'https://gitlab.haskell.org/api/v4/projects/1/jobs/artifacts/master/raw/ghc-x86_64-fedora27-linux.tar.xz?job=validate-x86_64-linux-fedora27' head`
 
-4. isolated install HLS
+4. isolated install HLS  
     - `ghcup install hls --isolate /home/username/dir/hls/`
 
-5. you can even compile ghc to an isolated location.
-    - `ghcup compile ghc -j 4 -v 9.0.1 -b 8.10.5 -i /home/username/my/dir/ghc`
+5. you can even compile ghc to an isolated location.  
+    - `ghcup compile ghc -j 4 -v 9.0.1 -b 8.10.5 -i /home/username/my/dir/ghc` 
 
 ## Continuous integration
 
-On Windows, GHCup can be installed automatically on a CI runner
-non-interactively, as below. The paramaters to the PowerShell script are
-specified positionally, after `-ArgumentList`:
+On windows, ghcup can be installed automatically on a CI runner non-interactively like so:
 
 ```ps
-$ErrorActionPreference = 'Stop';Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;try { Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $false,$true,$true,$false,$false,$false,$false,"C:\" } catch { Write-Error $_ }
+Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $false,$true,$true,$false,$false,$false,$false,"C:\"
 ```
 
-`$ErrorActionPreference = 'Stop'` here acts like `set -e` and stops execution if ghcup installation fails.
-
 On linux/darwin/freebsd, run the following on your runner:
 
 ```sh
 curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_MINIMAL=1 sh
 ```
 
-This will just install `ghcup` and on Windows additionally MSYS2.
+This will just install `ghcup` and on windows additionally `msys2`.
 
-See the installation scripts referred to above for the full list of environment
-variables and, in the case of Windows, parameters to tweak the script behavior.
+For the full list of env variables and parameters to tweak the script behavior, see:
 
-### github workflows
+* [bootstrap-haskell for linux/darwin/freebsd](https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/scripts/bootstrap/bootstrap-haskell#L7)
+* [bootstrap-haskell.ps1 for windows](https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/scripts/bootstrap/bootstrap-haskell.ps1#L17)
 
-On github workflows GHCup itself is pre-installed on all platforms, but may use non-standard install locations.
-Here's an example workflow with a GHC matrix:
+### Example github workflow
+
+On github workflows you can use [https://github.com/haskell/actions/](https://github.com/haskell/actions/)
+
+If you want to install ghcup manually though, here's an example config:
+
+```yml
+name: Haskell CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
-```yaml
 jobs:
-  build:
+  build-cabal:
+
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macOS-latest]
-        ghc: ['9.6', '9.4', '9.2', '9.0', '8.10', '8.8', '8.6']
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup toolchain
-      run: |
-        ghcup install cabal --set recommended
-        ghcup install ghc --set ${{ matrix.ghc }}
-    - name: Build
-      run: |
-        cabal update
-        cabal test all --test-show-details=direct
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+        ghc: ['8.10.7', '9.0.1']
+        cabal: ['3.4.0.0']
 
-  i386:
-    runs-on: ubuntu-latest
-    container:
-      image: i386/ubuntu:bionic
     steps:
-    - name: Install GHCup in container
+    - uses: actions/checkout@v2
+
+    - if: matrix.os == 'windows-latest'
+      name: Install ghcup on windows
+      run: Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $false,$true,$true,$false,$false,$false,$false,"C:\"
+
+    - if: matrix.os == 'windows-latest'
+      name: Add ghcup to PATH
+      run: echo "/c/ghcup/bin" >> $GITHUB_PATH
+      shell: bash
+
+    - if: matrix.os != 'windows-latest'
+      name: Install ghcup on non-windows
+      run: curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_MINIMAL=1 sh
+
+    - name: Install ghc/cabal
       run: |
-        apt-get update -y
-        apt-get install -y autoconf build-essential zlib1g-dev libgmp-dev curl
-        # we just go with recommended versions of cabal and GHC
-        curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 sh
-    - uses: actions/checkout@v1
-    - name: Test
-      run: |
-        # in containers we need to fix PATH
-        source ~/.ghcup/env
-        cabal update
-        cabal test all --test-show-details=direct
+        ghcup install ghc ${{ matrix.ghc }}
+        ghcup install cabal ${{ matrix.cabal }}
+      shell: bash
+
+    - name: Update cabal index
+      run: cabal update
+      shell: bash
+
+    - name: Build
+      run: cabal build --enable-tests --enable-benchmarks
+      shell: bash
+
+    - name: Run tests
+      run: cabal test
+      shell: bash
 ```
 
 ## GPG verification
@@ -680,13 +235,10 @@ jobs:
 GHCup supports verifying the GPG signature of the metadata file. The metadata file then contains SHA256 hashes of all downloads, so
 this is cryptographically secure.
 
-First, obtain the gpg keys:
+First, obtain the gpg key:
 
 ```sh
-gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C
-gpg --batch --keyserver keyserver.ubuntu.com --recv-keys FE5AB6C91FEA597C3B31180B73EDE9E8CFBAEF01
-gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
-gpg --batch --keyserver keyserver.ubuntu.com --recv-keys EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF
+gpg --batch --keyserver keys.openpgp.org --recv-keys 7784930957807690A66EBDBE3786C5262ECB4A3F
 ```
 
 Then verify the gpg key in one of these ways:
@@ -705,48 +257,51 @@ gpg-setting: GPGLax # GPGStrict | GPGLax | GPGNone
 
 In `GPGStrict` mode, ghcup will fail if verification fails. In `GPGLax` mode it will just print a warning.
 You can also pass the mode via `ghcup --gpg <strict|lax|none>`.
+   
+## Tips and tricks
 
-# Tips and tricks
+### with_ghc wrapper (e.g. for HLS)
 
-## ghcup run
+Due to some HLS [bugs](https://github.com/mpickering/hie-bios/issues/194) it's necessary that the `ghc` in PATH
+is the one defined in `cabal.project`. With some simple shell functions, we can start our editor with the appropriate
+path prepended.
 
-If you don't want to explicitly switch the active GHC all the time and are using
-tools that rely on the plain `ghc` binary, GHCup provides an easy way to execute
-commands with a certain toolchain prepended to PATH, e.g.:
+For bash, in e.g. `~/.bashrc` define:
 
 ```sh
-ghcup run --ghc 8.10.7 --cabal latest --hls latest --stack latest --install -- code Setup.hs
+with_ghc() {
+  local np=$(ghcup --offline whereis -d ghc $1 || { ghcup --cache install ghc $1 && ghcup whereis -d ghc $1 ;})
+  if [ -e "${np}" ] ; then
+    shift
+    PATH="$np:$PATH" "$@"
+  else
+    >&2 echo "Cannot find or install GHC version $1"
+    return 1
+  fi
+}
 ```
 
-This will execute vscode with GHC set to 8.10.7 and all other tools to their latest version.
+For fish shell, in e.g. `~/.config/fish/config.fish` define:
 
-# Troubleshooting
-
-## Script immediately exits on windows
-
-There are two possible reasons:
-
-1. your company blocks the script (some have a whitelist)... ask your administrator
-2. your Antivirus or Windows Defender interfere with the installation. Disable them temporarily.
-
-## C compiler cannot create executables
-
-### Darwin
-
-You need to update your XCode command line tools, e.g. [like this](https://stackoverflow.com/questions/34617452/how-to-update-xcode-from-command-line).
-
-## Certificate authority errors (curl)
-
-If your certificates are outdated or improperly configured, curl may be unable
-to download ghcup.
-
-There are two known workarounds:
-
-1. Tell curl to ignore certificate errors (dangerous): `curl -k https://raw.githubusercontent.com/haskell/ghcup-hs/master/scripts/bootstrap/bootstrap-haskell | GHCUP_CURL_OPTS="-k" sh`
-2. Try to use wget instead: `wget -O /dev/stdout https://raw.githubusercontent.com/haskell/ghcup-hs/master/scripts/bootstrap/bootstrap-haskell | BOOTSTRAP_HASKELL_DOWNLOADER=wget sh`
-
-On windows, you can disable curl like so:
-
-```pwsh
-Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;try { Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $true,$false,$false,$false,$false,$false,$false,"","","","",$true } catch { Write-Error $_ }
+```fish
+function with_ghc
+  set --local np (ghcup --offline whereis -d ghc $argv[1] ; or begin ghcup --cache install ghc $argv[1] ; and ghcup whereis -d ghc $argv[1] ; end)
+  if test -e "$np"
+    PATH="$np:$PATH" $argv[2..-1]
+  else
+    echo "Cannot find or install GHC version $argv[1]" 1>&2
+    return 1
+  end
+end
 ```
+
+Then start a new shell and issue:
+
+```sh
+# replace 'code' with your editor
+with_ghc 8.10.5 code path/to/haskell/source
+```
+
+Cabal and HLS will now see `8.10.5` as the primary GHC, without the need to
+run `ghcup set` all the time when switching between projects.
+

docs/index.md

@@ -4,16 +4,19 @@ 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>
 </section>
 
-<p class="ghcup-intro">GHCup is the main installer for the general purpose language <a href="https://www.haskell.org">Haskell</a>.</p>
+<p class="ghcup-intro">GHCup is an installer for the general purpose language <a href="https://www.haskell.org">Haskell</a>.</p>
 
 <div class="text-center main-buttons">
-<a href="install/" class="btn btn-primary" role="button">Installation</a>
-<a href="steps/" class="btn btn-primary" role="button">First steps</a>
+<a href="install/" class="btn btn-primary" role="button">Getting Started</a>
 <a href="guide/" class="btn btn-primary" role="button">User Guide</a>
 </div>
 
@@ -31,7 +34,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-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>
+		<a href="https://gitlab.haskell.org/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>
 	</div>
     </div>
 
@@ -41,19 +44,19 @@ hide:
 
       <div class="command-button">
 	    <pre>
-          <span class="ghcup-command" id="ghcup-command-windows">Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; try { Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $true } catch { Write-Error $_ }
+          <span class="ghcup-command" id="ghcup-command-windows">Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $true
           </span>
         </pre>
         <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-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>
+		<a href="https://gitlab.haskell.org/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>
 	</div>
     </div>
 </section>
 
 <p id="help" class="ghcup-help">
-  Need help? Check the <a href="guide/#troubleshooting">Troubleshooting section</a> or ask on
+  Need help? Ask on
   <span>
     <a href="https://kiwiirc.com/nextclient/irc.libera.chat/?nick=Guest%7C?#haskell,#haskell-ghcup">
       <img src="irc.svg" alt="" />
@@ -73,13 +76,16 @@ hide:
   </span>
    or
    <span>
-     <a href="https://github.com/haskell/ghcup-hs/issues">
+     <a href="https://gitlab.haskell.org/haskell/ghcup-hs/issues">
        report a bug
        <img src="Octicons-bug.svg" alt="" />
      </a>
    </span>
 </p>
 
+<script type="text/javascript" src="javascripts/ghcup.js"></script>
+
+
 ----
 
 

docs/install.md

@@ -1,10 +1,10 @@
-# Installation
+# Getting started
 
 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](./#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).
+macOS (aka Darwin), FreeBSD and Windows and can also bootstrap a fresh [Haskell developer environment](./install/#supported-tools) from scratch.
+It follows the unix 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
+## Installation
 
 The following commands will download the `ghcup` binary into `~/.ghcup/bin` (or `C:\ghcup\bin` on windows) and then
 run it to interactively install the [Haskell Toolchain](#supported-tools). These commands should be run as **non-root/non-admin
@@ -19,243 +19,39 @@ curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
 For Windows, run this in a PowerShell session:
 
 ```psh
-Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; try { Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $true } catch { Write-Error $_ }
+Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $true
 ```
 
-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://gitlab.haskell.org/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.
+## First steps
 
-### Which versions get installed?
-
-GHCup has two main channels for every tool: **recommended** and **latest**. By default, it installs *recommended*.
-
-*latest* follows the latest release of every tool, while *recommended* is at the discretion of the GHCup maintainers and based on community adoption (hackage libraries, tools like HLS, stackage support, etc.) and known bugs.
-
-Also see [tags and shortcuts](../guide/#tags-and-shortcuts) for more information.
-
-## System requirements
-
-### Linux Debian
-
-#### Generic
-
-The following distro packages are required: `build-essential curl libffi-dev libffi6 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5`
-
-#### Version >= 11 && <= 12
-
-The following distro packages are required: `build-essential curl libffi-dev libffi7 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5`
-
-#### Version >= 12
-
-The following distro packages are required: `build-essential curl libffi-dev libffi8 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5`
-
-### Linux Ubuntu
-
-#### Generic
-
-The following distro packages are required: `build-essential curl libffi-dev libffi6 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5`
-
-#### Version >= 20.04 && < 20.10
-
-The following distro packages are required: `build-essential curl libffi-dev libffi7 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5`
-
-#### Version >= 20.10 && < 23
-
-The following distro packages are required: `build-essential curl libffi-dev libffi8ubuntu1 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5`
-
-#### Version >= 23
-
-The following distro packages are required: `build-essential curl libffi-dev libffi8ubuntu1 libgmp-dev libgmp10 libncurses-dev`
-
-### Linux Fedora
-
-#### Generic
-
-The following distro packages are required: `gcc gcc-c++ gmp gmp-devel make ncurses ncurses-compat-libs xz perl`
-
-
-### Linux CentOS
-
-#### Generic
-
-The following distro packages are required: `gcc gcc-c++ gmp gmp-devel make ncurses ncurses-compat-libs xz perl`
-
-#### Version >= 7 && < 8
-
-The following distro packages are required: `gcc gcc-c++ gmp gmp-devel make ncurses xz perl`
-
-
-### Linux Alpine
-
-#### Generic
-
-The following distro packages are required: `binutils-gold curl gcc g++ gmp-dev libc-dev libffi-dev make musl-dev ncurses-dev perl tar xz`
-
-
-### Linux (generic)
-
-#### Generic
-
-You need the following packages: curl g++ gcc gmp make ncurses realpath xz-utils. Consult your distro documentation on the exact names of those packages.
-
-### Darwin
-
-#### Generic
-
-On OS X, in the course of running ghcup you will be given a dialog box to install the command line tools. Accept and the requirements will be installed for you. You will then need to run the command again.
-On Darwin M1 you might also need a working llvm installed (e.g. via brew) and have the toolchain exposed in PATH.
-
-### FreeBSD
-
-#### Generic
-
-The following distro packages are required: `curl gcc gmp gmake ncurses perl5 libffi libiconv`
-
-
-### Windows
-
-#### Generic
-
-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.
-
-## Next steps
-
-1. Follow the [First steps guide](../steps) on how to build a "Hello world" program, use `ghc`, run an interactive REPL and create a Haskell project
-2. To understand the difference and overlap of `stack` and `cabal`, read on [here](https://gist.github.com/merijn/8152d561fb8b011f9313c48d876ceb07)
-3. To learn Haskell proper check out the links at [How to learn Haskell proper](../steps#how-to-learn-haskell-proper)
-4. To learn more about Haskell Toolchain management, check out the [ghcup user guide](./guide.md)
+1. To get started with creating a Haskell project, follow the [Getting Started with Haskell and Cabal](https://cabal.readthedocs.io/en/latest/getting-started.html) guide
+2. To properly learn Haskell, run through the [CIS 194 Haskell course](https://www.cis.upenn.edu/~cis194/spring13/) including exercises
+3. To learn more about Haskell Toolchain management, check out the [ghcup user guide](./guide.md)
 
 ## Uninstallation
 
 On linux, just run `ghcup nuke`, then make sure any ghcup added lines in your `~/.bashrc` (or similar) are removed.
 
-On windows, right click on the `Uninstall Haskell.ps1` PowerShell script on your Desktop and select *Run with PowerShell*.
+On windows, double-click on the `Uninstall Haskell.ps1` PowerShell script on your Desktop.
 
 ## Supported tools
 
 GHCup supports the following tools, which are also known as the **Haskell Toolchain**:
 
-<details> <summary>Show all supported <a href='https://www.haskell.org/ghc/'>GHC</a> versions</summary>
-<table>
-<thead><tr><th>GHC Version</th><th>Tags</th></tr></thead>
-<tbody>
-<tr><td>9.8.1</td><td><span style="color:blue">latest</span>, base-4.19.0.0</td></tr>
-<tr><td>9.6.3</td><td>base-4.18.1.0</td></tr>
-<tr><td>9.6.2</td><td>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><span style="color:green">recommended</span>, 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.8</td><td>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>
-<tr><td>9.2.1</td><td>base-4.16.0.0</td></tr>
-<tr><td>9.0.2</td><td>base-4.15.1.0</td></tr>
-<tr><td>9.0.1</td><td>base-4.15.0.0</td></tr>
-<tr><td>8.10.7</td><td>base-4.14.3.0</td></tr>
-<tr><td>8.10.6</td><td>base-4.14.3.0</td></tr>
-<tr><td>8.10.5</td><td>base-4.14.2.0</td></tr>
-<tr><td>8.10.4</td><td>base-4.14.1.0</td></tr>
-<tr><td>8.10.3</td><td>base-4.14.1.0</td></tr>
-<tr><td>8.10.2</td><td>base-4.14.1.0</td></tr>
-<tr><td>8.10.1</td><td>base-4.14.0.0</td></tr>
-<tr><td>8.8.4</td><td>base-4.13.0.0</td></tr>
-<tr><td>8.8.3</td><td>base-4.13.0.0</td></tr>
-<tr><td>8.8.2</td><td>base-4.13.0.0</td></tr>
-<tr><td>8.8.1</td><td>base-4.13.0.0</td></tr>
-<tr><td>8.6.5</td><td>base-4.12.0.0</td></tr>
-<tr><td>8.6.4</td><td>base-4.12.0.0</td></tr>
-<tr><td>8.6.3</td><td>base-4.12.0.0</td></tr>
-<tr><td>8.6.2</td><td>base-4.12.0.0</td></tr>
-<tr><td>8.6.1</td><td>base-4.12.0.0</td></tr>
-<tr><td>8.4.4</td><td>base-4.11.1.0</td></tr>
-<tr><td>8.4.3</td><td>base-4.11.1.0</td></tr>
-<tr><td>8.4.2</td><td>base-4.11.1.0</td></tr>
-<tr><td>8.4.1</td><td>base-4.11.0.0</td></tr>
-<tr><td>8.2.2</td><td>base-4.10.1.0</td></tr>
-<tr><td>8.0.2</td><td>base-4.9.1.0</td></tr>
-<tr><td>7.10.3</td><td>base-4.8.2.0</td></tr>
-</tbody>
-</table>
-</details>
-
-<details> <summary>Show all supported <a href='https://cabal.readthedocs.io/en/stable/'>cabal-install</a> versions</summary>
-<table>
-<thead><tr><th>Cabal Version</th><th>Tags</th></tr></thead>
-<tbody>
-<tr><td>3.10.2.0</td><td><span style="color:blue">latest</span></td></tr>
-<tr><td>3.10.1.0</td><td></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>
-<tr><td>3.4.0.0</td><td></td></tr>
-<tr><td>3.2.0.0</td><td></td></tr>
-<tr><td>3.0.0.0</td><td></td></tr>
-<tr><td>2.4.1.0</td><td></td></tr>
-</tbody>
-</table>
-</details>
-
-<details> <summary>Show all supported <a href='https://haskell-language-server.readthedocs.io/en/stable/'>HLS</a> versions</summary>
-<table>
-<thead><tr><th>HLS Version</th><th>Tags</th></tr></thead>
-<tbody>
-<tr><td>2.4.0.0</td><td><span style="color:blue">latest</span>, <span style="color:green">recommended</span></td></tr>
-<tr><td>2.3.0.0</td><td></td></tr>
-<tr><td>2.2.0.0</td><td></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>
-<tr><td>1.5.1</td><td></td></tr>
-<tr><td>1.5.0</td><td></td></tr>
-<tr><td>1.4.0</td><td></td></tr>
-<tr><td>1.3.0</td><td></td></tr>
-<tr><td>1.2.0</td><td></td></tr>
-<tr><td>1.1.0</td><td></td></tr>
-</tbody>
-</table>
-</details>
-
-<details> <summary>Show all supported <a href='https://docs.haskellstack.org/en/stable/README/'>Stack</a> versions</summary>
-<table>
-<thead><tr><th>Stack Version</th><th>Tags</th></tr></thead>
-<tbody>
-<tr><td>2.13.1</td><td><span style="color:blue">latest</span></td></tr>
-<tr><td>2.11.1</td><td><span style="color:green">recommended</span></td></tr>
-<tr><td>2.9.3</td><td></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>
-<tr><td>2.5.1</td><td></td></tr>
-</tbody>
-</table>
-</details>
+1. [GHC](https://www.haskell.org/ghc/)
+2. [cabal-install](https://cabal.readthedocs.io/en/latest/)
+3. [haskell-language-server](https://haskell-language-server.readthedocs.io/en/latest/)
+4. [stack](https://docs.haskellstack.org/en/latest/README/)
 
 ## Supported platforms
 
 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 8.1 | amd64 | ✅ | ✅ | ✅ | ✅ | ✅ |
+| Windows 7 | amd64 | ❔ | ✅ | ✅ | ✅ | ✅ |
 | Windows 10 | amd64 | ✅ | ✅ | ✅ | ✅ | ✅ |
 | Windows Server 2016 | amd64 | ✅ | ✅ | ✅ | ✅ | ✅ |
 | Windows Server 2019 | amd64 | ✅ | ✅ | ✅ | ✅ | ✅ |
@@ -271,51 +67,41 @@ This list may not be exhaustive and specifies support for bindists only.
 | Linux generic | aarch64 | ✅ | ⚠️ | ✅ | ⚠️ | ❌ |
 | Linux generic | armv7 | ✅ | ⚠️ | ✅ | ⚠️ | ❌ |
 
-### Windows <8.1
+### Windows 7
 
-No longer supported for recent GHCs, according to manual testing of GHC 9.8.1 on Windows 7.
-According to [msys2 documentation](https://www.msys2.org/docs/windows_support), the minimum Windows
-version is now 8.1.
+May or may not work, several issues:
+
+* [https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/140](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/140)
+* [https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/197](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/197)
 
 ### WSL1
 
 Unsupported. GHC may or may not work. Upgrade to WSL2.
 
-### MacOS <10.13
+### MacOS <13
 
-Not supported. Would require separate binaries, since >=10.13 binaries are incompatible.
+Not supported. Would require separate binaries, since >=13 binaries are incompatible.
 Please upgrade.
 
 ### MacOS aarch64
 
-HLS bindists are still experimental. Stack has only unofficial binaries for this platform.
-There are various issues with GHC itself.
+HLS bindists are still experimental. Stack is theoretically supported, but has no binaries yet.
 
 ### FreeBSD
 
-Lacks some upstream bindists and may need compat libs (such as `misc/compat12x`).
+Lacks some upstream bindists and may need compat libs, since most bindists are built on FreeBSD-12.
 HLS bindists are experimental.
-Only latest FreeBSD is generally supported.
 
 ### Linux ARMv7/AARCH64
 
-Lower availability of bindists. Stack and HLS binaries are experimental.
+Lower availability of bindists. HLS only has experimental ones. Stack not supported currently.
 
-## Manual installation
-
-### Unix
+## Manual install
 
 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:
-
-```sh
-gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C
-gpg --batch --keyserver keyserver.ubuntu.com --recv-keys FE5AB6C91FEA597C3B31180B73EDE9E8CFBAEF01
-gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
-gpg --batch --keyserver keyserver.ubuntu.com --recv-keys EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF
-```
+If you want to GPG verify the binaries, import the following key first: `7784930957807690A66EBDBE3786C5262ECB4A3F`.
 
 Then adjust your `PATH` in `~/.bashrc` (or similar, depending on your shell) like so:
 
@@ -323,96 +109,14 @@ Then adjust your `PATH` in `~/.bashrc` (or similar, depending on your shell) lik
 export PATH="$HOME/.cabal/bin:$HOME/.ghcup/bin:$PATH"
 ```
 
-### Windows
-
-1. Install ghcup binary
-    - choose a base directory for installation, e.g. `C:\` that has sufficient space
-    - then create the directory, e.g. `C:\ghcup\bin`
-    - download the binary: https://downloads.haskell.org/~ghcup/x86_64-mingw64-ghcup.exe
-    - place it as `ghcup.exe` into e.g. `C:\ghcup\bin`
-2. Install MSYS2
-    - download https://repo.msys2.org/distrib/msys2-x86_64-latest.exe and execute it
-    - remember the installation destination you choose (default is `C:\msys64`)
-    - finish the installation
-* Add environment variables and update `Path`
-    - open search bar and type in "Edit the system environment variables", then open it
-    - click on "Environment Variables..." at the near bottom
-    - in the upper half, select `Path` variable and double click on it
-    - in the new window, click "New", type in `C:\ghcup\bin` (depending on step 1.) and press enter
-    - click "OK" at the bottom
-    - in the upper half, click on "New..."
-    - enter `GHCUP_MSYS2` under "Variable name" and the installation destination from step 2. under "Variable value"
-    - click "OK" at the bottom
-    - in the upper half, click on "New..."
-    - enter `GHCUP_INSTALL_BASE_PREFIX` under "Variable name" and based on the installation destination from step 1. enter the device directory (default `C:\`)
-    - click "OK" at the bottom
-    - in the upper half, click on "New..."
-    - enter `CABAL_DIR` under "Variable name" and based on the installation destination from step 1. enter the device directory + `cabal` subdir (default `C:\cabal`)
-    - click "OK" at the bottom
-    - click "OK" at the bottom
-    - click "OK" at the bottom
-3. Install tools
-    - open powershell
-    - run `ghcup install ghc --set recommended`
-    - run `ghcup install cabal latest`
-    - run `ghcup install stack latest`
-    - run `ghcup install hls latest`
-    - run `cabal update`
-4. Update msys2
-    - run `ghcup run -m -- pacman --noconfirm -Syuu`
-    - run `ghcup run -m -- pacman --noconfirm -Syuu`
-    - run `ghcup run -m -- pacman --noconfirm -S --needed curl autoconf mingw-w64-x86_64-pkgconf`
-    - run `ghcup run -m -- pacman --noconfirm -S ca-certificates`
-5. Update cabal config
-    - go to e.g. `C:\cabal` (based on device you picked in 1.)
-    - open file `config`
-    - uncomment `extra-include-dirs` (the `-- `) and add the value (depending on installation destination you chose in 2.), e.g. `C:\msys64\mingw64\include`... so the final line should be `extra-include-dirs: C:\msys64\mingw64\include`
-    - uncomment `extra-lib-dirs` and do the same, adding `C:\msys64\mingw64\lib`
-    - uncomment `extra-prog-path` and set it to `C:\ghcup\bin, C:\cabal\bin, C:\msys64\mingw64\bin, C:\msys64\usr\bin`, depending on your install destinations from 1. and 2.
-6. Set up msys2 shell
-    - run `ghcup run -m -- sed -i -e 's/db_home:.*$/db_home: windows/' /etc/nsswitch.conf` to make the HOME in your msys2 shell match the one from windows
-    - make a desktop shortcut from `C:\msys64\msys2_shell.cmd`, which will allow you to start a proper msys2 shell
-    - run `ghcup run -m -- sed -i -e 's/#MSYS2_PATH_TYPE=.*/MSYS2_PATH_TYPE=inherit/' /c/msys64/msys2.ini`
-    - run `ghcup run -m -- sed -i -e 's/rem set MSYS2_PATH_TYPE=inherit/set MSYS2_PATH_TYPE=inherit/' /c/msys64/msys2_shell.cmd`
-
-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).
 
-## VSCode integration
-The developers of the Haskell Language Server offer an [extension](https://github.com/haskell/vscode-haskell) tightly integrated with the [Haskell Language Server](https://github.com/haskell/haskell-language-server). To get started:
-
-1. Install GHCup. During installation, opt in to install the Haskell Language Server (HLS).
-2. Install the extension (from VSCode: Ctrl + P and then `ext install haskell.haskell`).
-3. Make sure your project uses the GHC version installed from GHCup (otherwise HLS is likely to fail on launch):
-    - instructions for [stack](https://docs.haskellstack.org/en/stable/yaml_configuration/#system-ghc)
-
-On Linux, some users have reported an issue when VSCode is not launched from a terminal ("cannot find ghc version"). A solution is to [let HLS know about your GHCup on $PATH](https://github.com/haskell/vscode-haskell#stackcabalghc-can-not-be-found).
-
 ## Get help
 
 * [Libera IRC chat on #haskell-ghcup or #haskell](https://kiwiirc.com/nextclient/irc.libera.chat/?nick=Guest%7C?#haskell,#haskell-ghcup)
-* [GHCup issue tracker](https://github.com/haskell/ghcup-hs/issues/new)
+* [GHCup issue tracker](https://gitlab.haskell.org/haskell/ghcup-hs/issues)
 * [Matrix](https://app.element.io/#/room/#haskell-tooling:matrix.org)
 * [Discord](https://discord.gg/pKYf3zDQU7)
 

docs/modules_small.svg

@@ -1,536 +1,366 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 5.0.0 (0)
+<!-- Generated by graphviz version 2.44.0 (0)
  -->
 <!-- Title: G Pages: 1 -->
-<svg width="720pt" height="648pt"
- viewBox="0.00 0.00 719.74 648.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(0.580229 0.580229) rotate(0) translate(4 1112.8)">
+<svg width="719pt" height="648pt"
+ viewBox="0.00 0.00 719.28 648.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(0.81 0.81) rotate(0) translate(4 794.2)">
 <title>G</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-1112.8 1236.45,-1112.8 1236.45,4 -4,4"/>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-794.2 882,-794.2 882,4 -4,4"/>
 <g id="clust1" class="cluster">
 <title>cluster_0</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="8,-14.04 8,-1094.76 1156,-1094.76 1156,-14.04 8,-14.04"/>
-<text text-anchor="middle" x="582" y="-1079.56" font-family="Times,serif" font-size="14.00">GHCup</text>
+<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="8,-8.95 8,-660.37 870,-660.37 870,-8.95 8,-8.95"/>
+<text text-anchor="middle" x="439" y="-645.17" font-family="Times-Roman" font-size="14.00">GHCup</text>
 </g>
 <g id="clust2" class="cluster">
 <title>cluster_1</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="661,-700.02 661,-963.18 929,-963.18 929,-700.02 661,-700.02"/>
-<text text-anchor="middle" x="795" y="-947.98" font-family="Times,serif" font-size="14.00">Download</text>
+<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="190,-364.88 190,-541.72 450,-541.72 450,-364.88 190,-364.88"/>
+<text text-anchor="middle" x="320" y="-526.52" font-family="Times-Roman" font-size="14.00">Download</text>
 </g>
 <g id="clust3" class="cluster">
 <title>cluster_2</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="545,-28.07 545,-685.98 1020,-685.98 1020,-28.07 545,-28.07"/>
-<text text-anchor="middle" x="782.5" y="-670.78" font-family="Times,serif" font-size="14.00">Prelude</text>
+<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="271,-191.39 271,-355.93 452,-355.93 452,-191.39 271,-191.39"/>
+<text text-anchor="middle" x="361.5" y="-340.73" font-family="Times-Roman" font-size="14.00">Types</text>
 </g>
 <g id="clust4" class="cluster">
 <title>cluster_3</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="558,-154.39 558,-285.97 735,-285.97 735,-154.39 558,-154.39"/>
-<text text-anchor="middle" x="646.5" y="-270.77" font-family="Times,serif" font-size="14.00">File</text>
+<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="566,-17.91 566,-576.42 862,-576.42 862,-17.91 566,-17.91"/>
+<text text-anchor="middle" x="714" y="-561.22" font-family="Times-Roman" font-size="14.00">Utils</text>
 </g>
 <g id="clust5" class="cluster">
 <title>cluster_4</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="553,-300.01 553,-431.59 771,-431.59 771,-300.01 553,-300.01"/>
-<text text-anchor="middle" x="662" y="-416.39" font-family="Times,serif" font-size="14.00">Logger</text>
+<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="640,-271.98 640,-448.82 758,-448.82 758,-271.98 640,-271.98"/>
+<text text-anchor="middle" x="699" y="-433.62" font-family="Times-Roman" font-size="14.00">File</text>
 </g>
 <g id="clust6" class="cluster">
 <title>cluster_5</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="779,-300.01 779,-431.59 1012,-431.59 1012,-300.01 779,-300.01"/>
-<text text-anchor="middle" x="895.5" y="-416.39" font-family="Times,serif" font-size="14.00">Process</text>
+<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="583,-26.86 583,-110.81 653,-110.81 653,-26.86 583,-26.86"/>
+<text text-anchor="middle" x="618" y="-95.61" font-family="Times-Roman" font-size="14.00">String</text>
 </g>
 <g id="clust7" class="cluster">
 <title>cluster_6</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="699,-500.01 699,-631.59 769,-631.59 769,-500.01 699,-500.01"/>
-<text text-anchor="middle" x="734" y="-616.39" font-family="Times,serif" font-size="14.00">String</text>
-</g>
-<g id="clust8" class="cluster">
-<title>cluster_7</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="942,-500.01 942,-631.59 1012,-631.59 1012,-500.01 942,-500.01"/>
-<text text-anchor="middle" x="977" y="-616.39" font-family="Times,serif" font-size="14.00">Version</text>
-</g>
-<g id="clust9" class="cluster">
-<title>cluster_8</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="16,-140.35 16,-485.98 413,-485.98 413,-140.35 16,-140.35"/>
-<text text-anchor="middle" x="214.5" y="-470.78" font-family="Times,serif" font-size="14.00">Types</text>
-</g>
-<g id="clust10" class="cluster">
-<title>cluster_9</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="24,-154.39 24,-431.59 230,-431.59 230,-154.39 24,-154.39"/>
-<text text-anchor="middle" x="127" y="-416.39" font-family="Times,serif" font-size="14.00">JSON</text>
-</g>
-<g id="clust11" class="cluster">
-<title>cluster_10</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="418,-700.02 418,-831.6 580,-831.6 580,-700.02 418,-700.02"/>
-<text text-anchor="middle" x="499" y="-816.4" font-family="Times,serif" font-size="14.00">Utils</text>
-</g>
-<!-- u2 -->
-<g id="node1" class="node">
-<title>u2</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="2" cx="864" cy="-877.04" rx="56.59" ry="18"/>
-<text text-anchor="middle" x="864" y="-873.34" font-family="Times,serif" font-size="14.00">Download</text>
-</g>
-<!-- u15 -->
-<g id="node26" class="node">
-<title>u15</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="1097" cy="-746.04" rx="51.19" ry="18"/>
-<text text-anchor="middle" x="1097" y="-742.34" font-family="Times,serif" font-size="14.00">Platform</text>
-</g>
-<!-- u2&#45;&gt;u15 -->
-<g id="edge20" class="edge">
-<title>u2&#45;&gt;u15</title>
-<path fill="none" stroke="black" d="M898.14,-862.66C933.72,-848.11 990.51,-823.14 1036,-795.04 1048.03,-787.6 1060.45,-778.2 1070.92,-769.69"/>
-<polygon fill="black" stroke="black" points="1073.38,-772.18 1078.85,-763.11 1068.92,-766.8 1073.38,-772.18"/>
-</g>
-<!-- u22 -->
-<g id="node27" class="node">
-<title>u22</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="982" cy="-746.04" rx="45.49" ry="18"/>
-<text text-anchor="middle" x="982" y="-742.34" font-family="Times,serif" font-size="14.00">Version</text>
-</g>
-<!-- u2&#45;&gt;u22 -->
-<g id="edge21" class="edge">
-<title>u2&#45;&gt;u22</title>
-<path fill="none" stroke="black" d="M879.18,-859.44C899.83,-836.86 936.88,-796.37 960.41,-770.64"/>
-<polygon fill="black" stroke="black" points="963.08,-772.91 967.24,-763.17 957.91,-768.18 963.08,-772.91"/>
-</g>
-<!-- u28 -->
-<g id="node2" class="node">
-<title>u28</title>
-<ellipse fill="#bbbbff" stroke="black" stroke-width="0" cx="777" cy="-746.04" rx="33.29" ry="18"/>
-<text text-anchor="middle" x="777" y="-742.34" font-family="Times,serif" font-size="14.00">Utils</text>
-</g>
-<!-- u16 -->
-<g id="node12" class="node">
-<title>u16</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="2" cx="826" cy="-546.04" rx="46.59" ry="18"/>
-<text text-anchor="middle" x="826" y="-542.34" font-family="Times,serif" font-size="14.00">Prelude</text>
-</g>
-<!-- u28&#45;&gt;u16 -->
-<g id="edge22" class="edge">
-<title>u28&#45;&gt;u16</title>
-<path fill="none" stroke="black" d="M781.18,-728.15C789.67,-693.83 809.02,-615.63 819.3,-574.11"/>
-<polygon fill="black" stroke="black" points="822.76,-574.7 821.76,-564.16 815.96,-573.02 822.76,-574.7"/>
-</g>
-<!-- u31 -->
-<g id="node3" class="node">
-<title>u31</title>
-<ellipse fill="#bbbbff" stroke="black" stroke-width="0" cx="729" cy="-877.04" rx="60.39" ry="18"/>
-<text text-anchor="middle" x="729" y="-873.34" font-family="Times,serif" font-size="14.00">IOStreams</text>
-</g>
-<!-- u31&#45;&gt;u28 -->
-<g id="edge23" class="edge">
-<title>u31&#45;&gt;u28</title>
-<path fill="none" stroke="black" d="M735.37,-858.91C743.52,-837 757.72,-798.86 767.23,-773.28"/>
-<polygon fill="black" stroke="black" points="770.55,-774.42 770.75,-763.83 763.98,-771.98 770.55,-774.42"/>
-</g>
-<!-- u19 -->
-<g id="node4" class="node">
-<title>u19</title>
-<ellipse fill="#ffbbbb" stroke="black" stroke-width="2" cx="595" cy="-200.04" rx="28.7" ry="18"/>
-<text text-anchor="middle" x="595" y="-196.34" font-family="Times,serif" font-size="14.00">File</text>
-</g>
-<!-- u17 -->
-<g id="node14" class="node">
-<title>u17</title>
-<ellipse fill="#ffbbbb" stroke="black" stroke-width="0" cx="601" cy="-74.04" rx="48.19" ry="18"/>
-<text text-anchor="middle" x="601" y="-70.34" font-family="Times,serif" font-size="14.00">Internal</text>
-</g>
-<!-- u19&#45;&gt;u17 -->
-<g id="edge27" class="edge">
-<title>u19&#45;&gt;u17</title>
-<path fill="none" stroke="black" d="M595.83,-181.79C596.83,-161.25 598.5,-126.67 599.67,-102.44"/>
-<polygon fill="black" stroke="black" points="603.19,-102.29 600.17,-92.13 596.19,-101.95 603.19,-102.29"/>
-</g>
-<!-- u3 -->
-<g id="node25" class="node">
-<title>u3</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="462" cy="-346.04" rx="40.89" ry="18"/>
-<text text-anchor="middle" x="462" y="-342.34" font-family="Times,serif" font-size="14.00">Errors</text>
-</g>
-<!-- u19&#45;&gt;u3 -->
-<g id="edge26" class="edge">
-<title>u19&#45;&gt;u3</title>
-<path fill="none" stroke="black" d="M581,-216.2C557.77,-241.35 511.1,-291.87 483.62,-321.63"/>
-<polygon fill="black" stroke="black" points="480.96,-319.35 476.74,-329.07 486.1,-324.1 480.96,-319.35"/>
-</g>
-<!-- u12 -->
-<g id="node5" class="node">
-<title>u12</title>
-<ellipse fill="#bbffff" stroke="black" stroke-width="0" cx="684" cy="-200.04" rx="42.79" ry="18"/>
-<text text-anchor="middle" x="684" y="-196.34" font-family="Times,serif" font-size="14.00">Search</text>
-</g>
-<!-- u4 -->
-<g id="node18" class="node">
-<title>u4</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="2" cx="367" cy="-200.04" rx="38.19" ry="18"/>
-<text text-anchor="middle" x="367" y="-196.34" font-family="Times,serif" font-size="14.00">Types</text>
-</g>
-<!-- u12&#45;&gt;u4 -->
-<g id="edge28" class="edge">
-<title>u12&#45;&gt;u4</title>
-<path fill="none" stroke="black" d="M677.28,-217.85C668.51,-238.23 651.02,-270.58 624,-284.54 599.91,-296.97 589.55,-290.02 563,-284.54 502.61,-272.07 437.92,-240.11 400.03,-219.26"/>
-<polygon fill="black" stroke="black" points="401.43,-216.04 391,-214.22 398.02,-222.15 401.43,-216.04"/>
-</g>
-<!-- u18 -->
-<g id="node6" class="node">
-<title>u18</title>
-<ellipse fill="#ffbbbb" stroke="black" stroke-width="2" cx="719" cy="-346.04" rx="43.59" ry="18"/>
-<text text-anchor="middle" x="719" y="-342.34" font-family="Times,serif" font-size="14.00">Logger</text>
-</g>
-<!-- u18&#45;&gt;u19 -->
-<g id="edge29" class="edge">
-<title>u18&#45;&gt;u19</title>
-<path fill="none" stroke="black" d="M703.82,-329.08C686.13,-310.31 656.24,-278.02 632,-249.04 625.56,-241.33 618.77,-232.7 612.8,-224.9"/>
-<polygon fill="black" stroke="black" points="615.52,-222.7 606.69,-216.85 609.95,-226.93 615.52,-222.7"/>
-</g>
-<!-- u14 -->
-<g id="node7" class="node">
-<title>u14</title>
-<ellipse fill="#ffbbff" stroke="black" stroke-width="0" cx="609" cy="-346.04" rx="48.19" ry="18"/>
-<text text-anchor="middle" x="609" y="-342.34" font-family="Times,serif" font-size="14.00">Internal</text>
-</g>
-<!-- u14&#45;&gt;u4 -->
-<g id="edge30" class="edge">
-<title>u14&#45;&gt;u4</title>
-<path fill="none" stroke="black" d="M584.46,-330.44C540.32,-304.17 447.59,-248.99 398.7,-219.9"/>
-<polygon fill="black" stroke="black" points="400.21,-216.72 389.82,-214.62 396.63,-222.74 400.21,-216.72"/>
-</g>
-<!-- u20 -->
-<g id="node8" class="node">
-<title>u20</title>
-<ellipse fill="#ffbbbb" stroke="black" stroke-width="2" cx="957" cy="-346.04" rx="46.59" ry="18"/>
-<text text-anchor="middle" x="957" y="-342.34" font-family="Times,serif" font-size="14.00">Process</text>
-</g>
-<!-- u32 -->
-<g id="node9" class="node">
-<title>u32</title>
-<ellipse fill="#77ff77" stroke="black" stroke-width="0" cx="840" cy="-346.04" rx="52.79" ry="18"/>
-<text text-anchor="middle" x="840" y="-342.34" font-family="Times,serif" font-size="14.00">Windows</text>
-</g>
-<!-- u32&#45;&gt;u12 -->
-<g id="edge31" class="edge">
-<title>u32&#45;&gt;u12</title>
-<path fill="none" stroke="black" d="M822.41,-328.8C794.64,-303.17 740.56,-253.24 708.84,-223.97"/>
-<polygon fill="black" stroke="black" points="711.01,-221.21 701.29,-217 706.26,-226.35 711.01,-221.21"/>
-</g>
-<!-- u13 -->
-<g id="node10" class="node">
-<title>u13</title>
-<ellipse fill="#ffff77" stroke="black" stroke-width="0" cx="734" cy="-546.04" rx="27" ry="18"/>
-<text text-anchor="middle" x="734" y="-542.34" font-family="Times,serif" font-size="14.00">QQ</text>
-</g>
-<!-- u21 -->
-<g id="node11" class="node">
-<title>u21</title>
-<ellipse fill="#7777ff" stroke="black" stroke-width="0" cx="977" cy="-546.04" rx="27" ry="18"/>
-<text text-anchor="middle" x="977" y="-542.34" font-family="Times,serif" font-size="14.00">QQ</text>
-</g>
-<!-- u16&#45;&gt;u18 -->
-<g id="edge24" class="edge">
-<title>u16&#45;&gt;u18</title>
-<path fill="none" stroke="black" d="M816.88,-528.15C798.12,-493.45 755.14,-413.91 732.9,-372.75"/>
-<polygon fill="black" stroke="black" points="735.93,-371.01 728.1,-363.87 729.77,-374.34 735.93,-371.01"/>
-</g>
-<!-- u10 -->
-<g id="node13" class="node">
-<title>u10</title>
-<ellipse fill="#ffbbbb" stroke="black" stroke-width="0" cx="621" cy="-546.04" rx="67.69" ry="18"/>
-<text text-anchor="middle" x="621" y="-542.34" font-family="Times,serif" font-size="14.00">MegaParsec</text>
-</g>
-<!-- u10&#45;&gt;u4 -->
-<g id="edge25" class="edge">
-<title>u10&#45;&gt;u4</title>
-<path fill="none" stroke="black" d="M608.83,-528.04C593.2,-505.6 566.08,-464.42 549,-426.04 528.99,-381.07 544.65,-360.74 517,-320.04 486.57,-275.23 434.11,-239.25 399.99,-219.02"/>
-<polygon fill="black" stroke="black" points="401.72,-215.97 391.31,-213.97 398.2,-222.02 401.72,-215.97"/>
-</g>
-<!-- u8 -->
-<g id="node15" class="node">
-<title>u8</title>
-<ellipse fill="#ff7777" stroke="black" stroke-width="2" cx="68" cy="-346.04" rx="36" ry="18"/>
-<text text-anchor="middle" x="68" y="-342.34" font-family="Times,serif" font-size="14.00">JSON</text>
-</g>
-<!-- u8&#45;&gt;u10 -->
-<g id="edge35" class="edge">
-<title>u8&#45;&gt;u10</title>
-<path fill="none" stroke="black" d="M73.11,-363.98C79.47,-382.14 92.13,-410.45 113,-426.04 241.65,-522.14 435.74,-542.2 542.93,-545.46"/>
-<polygon fill="black" stroke="black" points="542.94,-548.96 553.03,-545.72 543.13,-541.96 542.94,-548.96"/>
-</g>
-<!-- u9 -->
-<g id="node17" class="node">
-<title>u9</title>
-<ellipse fill="#77ffff" stroke="black" stroke-width="0" cx="68" cy="-200.04" rx="33.29" ry="18"/>
-<text text-anchor="middle" x="68" y="-196.34" font-family="Times,serif" font-size="14.00">Utils</text>
-</g>
-<!-- u8&#45;&gt;u9 -->
-<g id="edge37" class="edge">
-<title>u8&#45;&gt;u9</title>
-<path fill="none" stroke="black" d="M68,-327.95C68,-303.38 68,-257.79 68,-228.46"/>
-<polygon fill="black" stroke="black" points="71.5,-228.1 68,-218.1 64.5,-228.1 71.5,-228.1"/>
-</g>
-<!-- u5 -->
-<g id="node19" class="node">
-<title>u5</title>
-<ellipse fill="#ff7777" stroke="black" stroke-width="0" cx="274" cy="-200.04" rx="36.29" ry="18"/>
-<text text-anchor="middle" x="274" y="-196.34" font-family="Times,serif" font-size="14.00">Stack</text>
-</g>
-<!-- u8&#45;&gt;u5 -->
-<g id="edge36" class="edge">
-<title>u8&#45;&gt;u5</title>
-<path fill="none" stroke="black" d="M91.07,-331.98C135.2,-306.96 227.81,-254.25 234,-249.04 242.13,-242.19 249.89,-233.55 256.38,-225.5"/>
-<polygon fill="black" stroke="black" points="259.29,-227.46 262.64,-217.42 253.75,-223.18 259.29,-227.46"/>
-</g>
-<!-- u6 -->
-<g id="node16" class="node">
-<title>u6</title>
-<ellipse fill="#77ffff" stroke="black" stroke-width="0" cx="172" cy="-346.04" rx="50.09" ry="18"/>
-<text text-anchor="middle" x="172" y="-342.34" font-family="Times,serif" font-size="14.00">Versions</text>
-</g>
-<!-- u7 -->
-<g id="node22" class="node">
-<title>u7</title>
-<ellipse fill="#ff77ff" stroke="black" stroke-width="0" cx="457" cy="-746.04" rx="30.59" ry="18"/>
-<text text-anchor="middle" x="457" y="-742.34" font-family="Times,serif" font-size="14.00">Dirs</text>
-</g>
-<!-- u4&#45;&gt;u7 -->
-<g id="edge32" class="edge">
-<title>u4&#45;&gt;u7</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M371.51,-218.23C377.33,-241.24 387.28,-283.39 392,-320.04 409.38,-455.08 376.84,-493.26 407,-626.04 414.68,-659.84 431.33,-696.24 443.31,-719.76"/>
-<polygon fill="black" stroke="black" points="440.25,-721.44 447.96,-728.7 446.46,-718.22 440.25,-721.44"/>
-</g>
-<!-- u5&#45;&gt;u6 -->
-<g id="edge33" class="edge">
-<title>u5&#45;&gt;u6</title>
-<path fill="none" stroke="black" d="M262.44,-217.36C244.69,-242.42 210.6,-290.54 189.72,-320.01"/>
-<polygon fill="black" stroke="black" points="186.62,-318.33 183.7,-328.52 192.34,-322.38 186.62,-318.33"/>
-</g>
-<!-- u11 -->
-<g id="node20" class="node">
-<title>u11</title>
-<ellipse fill="#ff7777" stroke="black" stroke-width="0" cx="343" cy="-346.04" rx="40.09" ry="18"/>
-<text text-anchor="middle" x="343" y="-342.34" font-family="Times,serif" font-size="14.00">Optics</text>
-</g>
-<!-- u11&#45;&gt;u4 -->
-<g id="edge34" class="edge">
-<title>u11&#45;&gt;u4</title>
-<path fill="none" stroke="black" d="M345.85,-327.95C349.96,-303.27 357.61,-257.39 362.49,-228.08"/>
-<polygon fill="black" stroke="black" points="365.96,-228.54 364.16,-218.1 359.06,-227.39 365.96,-228.54"/>
-</g>
-<!-- u23 -->
-<g id="node21" class="node">
-<title>u23</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="2" cx="539" cy="-746.04" rx="33.29" ry="18"/>
-<text text-anchor="middle" x="539" y="-742.34" font-family="Times,serif" font-size="14.00">Utils</text>
-</g>
-<!-- u23&#45;&gt;u2 -->
-<g id="edge38" class="edge">
-<title>u23&#45;&gt;u2</title>
-<path fill="none" stroke="black" d="M564.74,-757.62C588.62,-767.41 625.16,-782.33 657,-795.04 713.2,-817.46 778.2,-842.8 820.15,-859.07"/>
-<polygon fill="black" stroke="black" points="818.93,-862.35 829.52,-862.7 821.46,-855.83 818.93,-862.35"/>
-</g>
-<!-- u7&#45;&gt;u12 -->
-<g id="edge40" class="edge">
-<title>u7&#45;&gt;u12</title>
-<path fill="none" stroke="black" d="M462.46,-728.29C469.7,-705.44 482.32,-663.09 489,-626.04 497.4,-579.47 487.79,-566.01 499,-520.04 509.67,-476.26 525.92,-469.71 537,-426.04 548.66,-380.08 526.65,-361.85 549,-320.04 572.04,-276.93 596.52,-281.58 633,-249.04 642.03,-240.98 651.75,-231.93 660.25,-223.88"/>
-<polygon fill="black" stroke="black" points="662.84,-226.25 667.67,-216.83 658.01,-221.18 662.84,-226.25"/>
-</g>
-<!-- u7&#45;&gt;u14 -->
-<g id="edge41" class="edge">
-<title>u7&#45;&gt;u14</title>
-<path fill="none" stroke="black" d="M463.12,-728.34C476.85,-690.97 511.24,-597.71 541,-520.04 560.88,-468.15 584.78,-407.79 598.3,-373.84"/>
-<polygon fill="black" stroke="black" points="601.7,-374.77 602.15,-364.19 595.19,-372.18 601.7,-374.77"/>
-</g>
-<!-- u7&#45;&gt;u13 -->
-<g id="edge42" class="edge">
-<title>u7&#45;&gt;u13</title>
-<path fill="none" stroke="black" d="M476.64,-732.05C483.03,-728.02 490.22,-723.68 497,-720.04 585.64,-672.38 633.79,-699.1 703,-626.04 716.59,-611.69 724.45,-590.68 728.86,-573.94"/>
-<polygon fill="black" stroke="black" points="732.27,-574.7 731.17,-564.16 725.46,-573.08 732.27,-574.7"/>
-</g>
-<!-- u7&#45;&gt;u8 -->
-<g id="edge44" class="edge">
-<title>u7&#45;&gt;u8</title>
-<path fill="none" stroke="black" d="M438.75,-731.41C384.23,-690.08 219.78,-560.69 113,-426.04 100.01,-409.65 88.41,-389.06 80.24,-373.01"/>
-<polygon fill="black" stroke="black" points="83.19,-371.09 75.62,-363.68 76.92,-374.2 83.19,-371.09"/>
-</g>
-<!-- u7&#45;&gt;u11 -->
-<g id="edge43" class="edge">
-<title>u7&#45;&gt;u11</title>
-<path fill="none" stroke="black" d="M446.94,-728.73C433.58,-706.37 410.16,-664.57 397,-626.04 366.47,-536.65 351.4,-424.92 345.75,-374.25"/>
-<polygon fill="black" stroke="black" points="349.2,-373.69 344.65,-364.12 342.25,-374.44 349.2,-373.69"/>
-</g>
-<!-- u7&#45;&gt;u3 -->
-<g id="edge39" class="edge">
-<title>u7&#45;&gt;u3</title>
-<path fill="none" stroke="black" d="M457.21,-727.93C458,-665.68 460.7,-450.79 461.66,-374.32"/>
-<polygon fill="black" stroke="black" points="465.16,-374.12 461.79,-364.07 458.16,-374.03 465.16,-374.12"/>
-</g>
-<!-- u0 -->
-<g id="node23" class="node">
-<title>u0</title>
-<ellipse fill="#bbffbb" stroke="black" stroke-width="2" cx="460" cy="-1009.04" rx="44.39" ry="18"/>
-<text text-anchor="middle" x="460" y="-1005.34" font-family="Times,serif" font-size="14.00">GHCup</text>
+<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="712,-457.78 712,-541.72 782,-541.72 782,-457.78 712,-457.78"/>
+<text text-anchor="middle" x="747" y="-526.52" font-family="Times-Roman" font-size="14.00">Version</text>
 </g>
 <!-- u1 -->
-<g id="node24" class="node">
+<g id="node1" class="node">
 <title>u1</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="286" cy="-877.04" rx="37.09" ry="18"/>
-<text text-anchor="middle" x="286" y="-873.34" font-family="Times,serif" font-size="14.00">Cabal</text>
+<ellipse fill="#ffffbb" stroke="black" stroke-width="2" cx="387" cy="-486.95" rx="55.49" ry="18"/>
+<text text-anchor="middle" x="387" y="-483.25" font-family="Times-Roman" font-size="14.00">Download</text>
+</g>
+<!-- u12 -->
+<g id="node7" class="node">
+<title>u12</title>
+<ellipse fill="#bbffff" stroke="black" stroke-width="2" cx="688" cy="-393.95" rx="27" ry="18"/>
+<text text-anchor="middle" x="688" y="-390.25" font-family="Times-Roman" font-size="14.00">File</text>
+</g>
+<!-- u1&#45;&gt;u12 -->
+<g id="edge15" class="edge">
+<title>u1&#45;&gt;u12</title>
+<path fill="none" stroke="black" d="M416.08,-471.48C425.43,-467.42 435.96,-463.44 446,-460.95 491.68,-449.63 616.67,-467.2 657,-442.95 665.62,-437.77 672.27,-429.17 677.16,-420.67"/>
+<polygon fill="black" stroke="black" points="680.34,-422.15 681.79,-411.65 674.11,-418.95 680.34,-422.15"/>
+</g>
+<!-- u11 -->
+<g id="node15" class="node">
+<title>u11</title>
+<ellipse fill="#bbffff" stroke="black" stroke-width="0" cx="603" cy="-393.95" rx="28.7" ry="18"/>
+<text text-anchor="middle" x="603" y="-390.25" font-family="Times-Roman" font-size="14.00">Dirs</text>
+</g>
+<!-- u1&#45;&gt;u11 -->
+<g id="edge14" class="edge">
+<title>u1&#45;&gt;u11</title>
+<path fill="none" stroke="black" d="M419.14,-472.31C427.86,-468.62 437.29,-464.63 446,-460.95 489.08,-442.77 538.85,-421.87 570.6,-408.54"/>
+<polygon fill="black" stroke="black" points="571.98,-411.76 579.85,-404.66 569.27,-405.3 571.98,-411.76"/>
+</g>
+<!-- u13 -->
+<g id="node18" class="node">
+<title>u13</title>
+<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="109" cy="-300.95" rx="44.39" ry="18"/>
+<text text-anchor="middle" x="109" y="-297.25" font-family="Times-Roman" font-size="14.00">Version</text>
+</g>
+<!-- u1&#45;&gt;u13 -->
+<g id="edge13" class="edge">
+<title>u1&#45;&gt;u13</title>
+<path fill="none" stroke="black" d="M356.68,-471.88C346.23,-467.63 334.3,-463.44 323,-460.95 290.82,-453.87 49.58,-466.95 27,-442.95 4.16,-418.68 12.6,-398.02 27,-367.95 36.61,-347.88 55.63,-331.97 72.94,-320.81"/>
+<polygon fill="black" stroke="black" points="75.07,-323.61 81.77,-315.4 71.41,-317.64 75.07,-323.61"/>
+</g>
+<!-- u17 -->
+<g id="node2" class="node">
+<title>u17</title>
+<ellipse fill="#bbbbff" stroke="black" stroke-width="0" cx="332" cy="-393.95" rx="30.59" ry="18"/>
+<text text-anchor="middle" x="332" y="-390.25" font-family="Times-Roman" font-size="14.00">Utils</text>
+</g>
+<!-- u5 -->
+<g id="node6" class="node">
+<title>u5</title>
+<ellipse fill="#ffbbbb" stroke="black" stroke-width="0" cx="410" cy="-300.95" rx="33.6" ry="18"/>
+<text text-anchor="middle" x="410" y="-297.25" font-family="Times-Roman" font-size="14.00">JSON</text>
+</g>
+<!-- u17&#45;&gt;u5 -->
+<g id="edge16" class="edge">
+<title>u17&#45;&gt;u5</title>
+<path fill="none" stroke="black" d="M345.23,-377.52C357.37,-363.35 375.54,-342.16 389.55,-325.81"/>
+<polygon fill="black" stroke="black" points="392.59,-327.64 396.44,-317.77 387.28,-323.09 392.59,-327.64"/>
+</g>
+<!-- u19 -->
+<g id="node3" class="node">
+<title>u19</title>
+<ellipse fill="#bbbbff" stroke="black" stroke-width="0" cx="256" cy="-486.95" rx="57.69" ry="18"/>
+<text text-anchor="middle" x="256" y="-483.25" font-family="Times-Roman" font-size="14.00">IOStreams</text>
+</g>
+<!-- u19&#45;&gt;u17 -->
+<g id="edge17" class="edge">
+<title>u19&#45;&gt;u17</title>
+<path fill="none" stroke="black" d="M272.49,-469.68C280.19,-461.83 289.33,-452.14 297,-442.95 303.18,-435.56 309.51,-427.17 315.06,-419.49"/>
+<polygon fill="black" stroke="black" points="318.21,-421.09 321.16,-410.91 312.51,-417.03 318.21,-421.09"/>
+</g>
+<!-- u3 -->
+<g id="node4" class="node">
+<title>u3</title>
+<ellipse fill="#ffffbb" stroke="black" stroke-width="2" cx="399" cy="-220.95" rx="36.29" ry="18"/>
+<text text-anchor="middle" x="399" y="-217.25" font-family="Times-Roman" font-size="14.00">Types</text>
+</g>
+<!-- u4 -->
+<g id="node5" class="node">
+<title>u4</title>
+<ellipse fill="#ffbbbb" stroke="black" stroke-width="0" cx="319" cy="-300.95" rx="39.79" ry="18"/>
+<text text-anchor="middle" x="319" y="-297.25" font-family="Times-Roman" font-size="14.00">Optics</text>
+</g>
+<!-- u4&#45;&gt;u3 -->
+<g id="edge18" class="edge">
+<title>u4&#45;&gt;u3</title>
+<path fill="none" stroke="black" d="M335.19,-284.17C346.87,-272.78 362.8,-257.24 375.83,-244.55"/>
+<polygon fill="black" stroke="black" points="378.39,-246.94 383.11,-237.45 373.5,-241.92 378.39,-246.94"/>
+</g>
+<!-- u6 -->
+<g id="node12" class="node">
+<title>u6</title>
+<ellipse fill="#bbffff" stroke="black" stroke-width="0" cx="638" cy="-486.95" rx="64.19" ry="18"/>
+<text text-anchor="middle" x="638" y="-483.25" font-family="Times-Roman" font-size="14.00">MegaParsec</text>
+</g>
+<!-- u5&#45;&gt;u6 -->
+<g id="edge19" class="edge">
+<title>u5&#45;&gt;u6</title>
+<path fill="none" stroke="black" d="M425.28,-317.32C443.67,-335.87 472.3,-364.95 474,-367.95 491,-397.97 469.27,-418.9 494,-442.95 518.89,-467.15 536.76,-450.95 570,-460.95 577.45,-463.2 585.27,-465.82 592.85,-468.5"/>
+<polygon fill="black" stroke="black" points="591.68,-471.8 602.27,-471.91 594.06,-465.22 591.68,-471.8"/>
+</g>
+<!-- u7 -->
+<g id="node13" class="node">
+<title>u7</title>
+<ellipse fill="#bbffff" stroke="black" stroke-width="0" cx="618" cy="-220.95" rx="44.39" ry="18"/>
+<text text-anchor="middle" x="618" y="-217.25" font-family="Times-Roman" font-size="14.00">Prelude</text>
+</g>
+<!-- u5&#45;&gt;u7 -->
+<g id="edge20" class="edge">
+<title>u5&#45;&gt;u7</title>
+<path fill="none" stroke="black" d="M429.11,-285.89C434.97,-281.99 441.58,-277.99 448,-274.95 487.67,-256.18 535.63,-241.92 570.48,-232.95"/>
+<polygon fill="black" stroke="black" points="571.56,-236.29 580.4,-230.45 569.85,-229.51 571.56,-236.29"/>
+</g>
+<!-- u9 -->
+<g id="node8" class="node">
+<title>u9</title>
+<ellipse fill="#ffbbff" stroke="black" stroke-width="0" cx="699" cy="-300.95" rx="51.19" ry="18"/>
+<text text-anchor="middle" x="699" y="-297.25" font-family="Times-Roman" font-size="14.00">Common</text>
+</g>
+<!-- u12&#45;&gt;u9 -->
+<g id="edge30" class="edge">
+<title>u12&#45;&gt;u9</title>
+<path fill="none" stroke="black" d="M690.07,-375.84C691.65,-362.75 693.87,-344.43 695.69,-329.32"/>
+<polygon fill="black" stroke="black" points="699.21,-329.34 696.94,-318.99 692.27,-328.5 699.21,-329.34"/>
+</g>
+<!-- u9&#45;&gt;u7 -->
+<g id="edge31" class="edge">
+<title>u9&#45;&gt;u7</title>
+<path fill="none" stroke="black" d="M682.22,-283.79C670.52,-272.53 654.74,-257.34 641.76,-244.83"/>
+<polygon fill="black" stroke="black" points="644.12,-242.24 634.48,-237.83 639.26,-247.29 644.12,-242.24"/>
+</g>
+<!-- u10 -->
+<g id="node9" class="node">
+<title>u10</title>
+<ellipse fill="#77ff77" stroke="black" stroke-width="0" cx="618" cy="-55.95" rx="27" ry="18"/>
+<text text-anchor="middle" x="618" y="-52.25" font-family="Times-Roman" font-size="14.00">QQ</text>
+</g>
+<!-- u16 -->
+<g id="node10" class="node">
+<title>u16</title>
+<ellipse fill="#ffff77" stroke="black" stroke-width="0" cx="747" cy="-486.95" rx="27" ry="18"/>
+<text text-anchor="middle" x="747" y="-483.25" font-family="Times-Roman" font-size="14.00">QQ</text>
+</g>
+<!-- u15 -->
+<g id="node11" class="node">
+<title>u15</title>
+<ellipse fill="#ffffbb" stroke="black" stroke-width="2" cx="823" cy="-486.95" rx="30.59" ry="18"/>
+<text text-anchor="middle" x="823" y="-483.25" font-family="Times-Roman" font-size="14.00">Utils</text>
+</g>
+<!-- u15&#45;&gt;u12 -->
+<g id="edge22" class="edge">
+<title>u15&#45;&gt;u12</title>
+<path fill="none" stroke="black" d="M803.42,-472.71C797.8,-468.92 791.66,-464.77 786,-460.95 761.96,-444.74 734.59,-426.31 714.9,-413.05"/>
+<polygon fill="black" stroke="black" points="716.68,-410.03 706.43,-407.35 712.77,-415.84 716.68,-410.03"/>
+</g>
+<!-- u15&#45;&gt;u11 -->
+<g id="edge21" class="edge">
+<title>u15&#45;&gt;u11</title>
+<path fill="none" stroke="black" d="M805.88,-471.91C799.92,-467.72 792.97,-463.55 786,-460.95 723.08,-437.5 693.45,-477.7 636,-442.95 627.23,-437.65 620.23,-429.02 614.98,-420.54"/>
+<polygon fill="black" stroke="black" points="617.89,-418.57 609.96,-411.54 611.78,-421.98 617.89,-418.57"/>
+</g>
+<!-- u6&#45;&gt;u3 -->
+<g id="edge23" class="edge">
+<title>u6&#45;&gt;u3</title>
+<path fill="none" stroke="black" d="M608.52,-470.77C594.78,-463.16 578.53,-453.36 565,-442.95 527.38,-414.03 523.93,-400.08 489,-367.95 479.95,-359.63 474.21,-360.56 468,-349.95 450.82,-320.62 469.18,-304.85 453,-274.95 446.44,-262.83 436.18,-251.74 426.36,-242.87"/>
+<polygon fill="black" stroke="black" points="428.53,-240.12 418.66,-236.26 423.97,-245.43 428.53,-240.12"/>
+</g>
+<!-- u8 -->
+<g id="node14" class="node">
+<title>u8</title>
+<ellipse fill="#bbffff" stroke="black" stroke-width="0" cx="618" cy="-139.95" rx="42.49" ry="18"/>
+<text text-anchor="middle" x="618" y="-136.25" font-family="Times-Roman" font-size="14.00">Logger</text>
+</g>
+<!-- u7&#45;&gt;u8 -->
+<g id="edge25" class="edge">
+<title>u7&#45;&gt;u8</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M618,-202.81C618,-192.67 618,-179.59 618,-168.07"/>
+<polygon fill="black" stroke="black" points="621.5,-168.06 618,-158.06 614.5,-168.06 621.5,-168.06"/>
+</g>
+<!-- u2 -->
+<g id="node17" class="node">
+<title>u2</title>
+<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="520" cy="-300.95" rx="37.89" ry="18"/>
+<text text-anchor="middle" x="520" y="-297.25" font-family="Times-Roman" font-size="14.00">Errors</text>
+</g>
+<!-- u7&#45;&gt;u2 -->
+<g id="edge24" class="edge">
+<title>u7&#45;&gt;u2</title>
+<path fill="none" stroke="black" d="M598.83,-237.21C584.07,-248.96 563.49,-265.34 547.06,-278.42"/>
+<polygon fill="black" stroke="black" points="544.54,-275.95 538.9,-284.91 548.9,-281.43 544.54,-275.95"/>
+</g>
+<!-- u8&#45;&gt;u4 -->
+<g id="edge26" class="edge">
+<title>u8&#45;&gt;u4</title>
+<path fill="none" stroke="black" d="M576.88,-144.38C511.17,-150.66 386.55,-166.09 354,-194.95 331.93,-214.52 323.74,-248.37 320.73,-272.34"/>
+<polygon fill="black" stroke="black" points="317.22,-272.27 319.67,-282.57 324.18,-272.99 317.22,-272.27"/>
+</g>
+<!-- u8&#45;&gt;u9 -->
+<g id="edge27" class="edge">
+<title>u8&#45;&gt;u9</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M637.21,-156.09C648.59,-166.01 662.41,-179.89 671,-194.95 684.9,-219.32 692.1,-250.8 695.69,-272.91"/>
+<polygon fill="black" stroke="black" points="692.25,-273.56 697.18,-282.94 699.17,-272.53 692.25,-273.56"/>
+</g>
+<!-- u8&#45;&gt;u10 -->
+<g id="edge28" class="edge">
+<title>u8&#45;&gt;u10</title>
+<path fill="none" stroke="black" d="M618,-121.56C618,-110.73 618,-96.56 618,-84.25"/>
+<polygon fill="black" stroke="black" points="621.5,-84.04 618,-74.04 614.5,-84.04 621.5,-84.04"/>
+</g>
+<!-- u11&#45;&gt;u5 -->
+<g id="edge29" class="edge">
+<title>u11&#45;&gt;u5</title>
+<path fill="none" stroke="black" d="M575.99,-387.58C537.44,-379.55 469,-363.89 448,-349.95 439.06,-344.02 431.26,-335.31 425.1,-326.92"/>
+<polygon fill="black" stroke="black" points="427.82,-324.71 419.28,-318.44 422.05,-328.67 427.82,-324.71"/>
+</g>
+<!-- u0 -->
+<g id="node16" class="node">
+<title>u0</title>
+<ellipse fill="#bbffbb" stroke="black" stroke-width="2" cx="627" cy="-605.95" rx="42.49" ry="18"/>
+<text text-anchor="middle" x="627" y="-602.25" font-family="Times-Roman" font-size="14.00">GHCup</text>
 </g>
 <!-- u0&#45;&gt;u1 -->
-<g id="edge3" class="edge">
-<title>u0&#45;&gt;u1</title>
-<path fill="none" stroke="black" d="M434.75,-994.25C408.03,-979.13 365.23,-953.36 332,-926.04 323.08,-918.7 314.11,-909.77 306.49,-901.61"/>
-<polygon fill="black" stroke="black" points="308.96,-899.13 299.64,-894.1 303.79,-903.85 308.96,-899.13"/>
-</g>
-<!-- u24 -->
-<g id="node28" class="node">
-<title>u24</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="539" cy="-877.04" rx="32.49" ry="18"/>
-<text text-anchor="middle" x="539" y="-873.34" font-family="Times,serif" font-size="14.00">GHC</text>
-</g>
-<!-- u0&#45;&gt;u24 -->
 <g id="edge4" class="edge">
-<title>u0&#45;&gt;u24</title>
-<path fill="none" stroke="black" d="M470.17,-991.31C483.75,-968.95 507.94,-929.15 523.72,-903.18"/>
-<polygon fill="black" stroke="black" points="526.92,-904.65 529.12,-894.29 520.94,-901.02 526.92,-904.65"/>
+<title>u0&#45;&gt;u1</title>
+<path fill="none" stroke="black" d="M584.67,-604.4C545.83,-602.07 488.09,-593.82 446,-566.95 425.91,-554.13 410.22,-531.89 400.09,-514.27"/>
+<polygon fill="black" stroke="black" points="402.91,-512.13 395.04,-505.04 396.77,-515.5 402.91,-512.13"/>
 </g>
-<!-- u25 -->
-<g id="node29" class="node">
-<title>u25</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="620" cy="-877.04" rx="30.59" ry="18"/>
-<text text-anchor="middle" x="620" y="-873.34" font-family="Times,serif" font-size="14.00">HLS</text>
-</g>
-<!-- u0&#45;&gt;u25 -->
-<g id="edge5" class="edge">
-<title>u0&#45;&gt;u25</title>
-<path fill="none" stroke="black" d="M484.89,-993.83C510.23,-978.75 549.94,-953.36 580,-926.04 587.86,-918.89 595.57,-910.18 602.08,-902.15"/>
-<polygon fill="black" stroke="black" points="604.96,-904.15 608.4,-894.13 599.46,-899.83 604.96,-904.15"/>
-</g>
-<!-- u26 -->
-<g id="node30" class="node">
-<title>u26</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="377" cy="-877.04" rx="36.29" ry="18"/>
-<text text-anchor="middle" x="377" y="-873.34" font-family="Times,serif" font-size="14.00">Stack</text>
-</g>
-<!-- u0&#45;&gt;u26 -->
+<!-- u0&#45;&gt;u16 -->
 <g id="edge6" class="edge">
-<title>u0&#45;&gt;u26</title>
-<path fill="none" stroke="black" d="M449.32,-991.31C434.98,-968.85 409.41,-928.8 392.83,-902.84"/>
-<polygon fill="black" stroke="black" points="395.71,-900.84 387.38,-894.29 389.81,-904.6 395.71,-900.84"/>
+<title>u0&#45;&gt;u16</title>
+<path fill="none" stroke="black" d="M663.33,-596.57C681.18,-590.83 701.84,-581.54 716,-566.95 729.77,-552.77 737.62,-531.76 741.97,-514.97"/>
+<polygon fill="black" stroke="black" points="745.4,-515.69 744.26,-505.16 738.58,-514.11 745.4,-515.69"/>
 </g>
-<!-- u27 -->
-<g id="node31" class="node">
-<title>u27</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="460" cy="-877.04" rx="28.7" ry="18"/>
-<text text-anchor="middle" x="460" y="-873.34" font-family="Times,serif" font-size="14.00">List</text>
+<!-- u0&#45;&gt;u15 -->
+<g id="edge5" class="edge">
+<title>u0&#45;&gt;u15</title>
+<path fill="none" stroke="black" d="M669.23,-604.64C704.08,-602.27 753,-593.85 786,-566.95 801.95,-553.96 811.39,-532.52 816.74,-515.25"/>
+<polygon fill="black" stroke="black" points="820.24,-515.72 819.56,-505.15 813.5,-513.84 820.24,-515.72"/>
 </g>
-<!-- u0&#45;&gt;u27 -->
+<!-- u14 -->
+<g id="node19" class="node">
+<title>u14</title>
+<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="508" cy="-486.95" rx="48.19" ry="18"/>
+<text text-anchor="middle" x="508" y="-483.25" font-family="Times-Roman" font-size="14.00">Platform</text>
+</g>
+<!-- u0&#45;&gt;u14 -->
+<g id="edge3" class="edge">
+<title>u0&#45;&gt;u14</title>
+<path fill="none" stroke="black" d="M599.25,-592.23C586.98,-585.76 572.9,-577.11 562,-566.95 545.64,-551.71 531.56,-530.66 521.88,-514.12"/>
+<polygon fill="black" stroke="black" points="524.68,-511.96 516.71,-504.98 518.59,-515.41 524.68,-511.96"/>
+</g>
+<!-- u2&#45;&gt;u3 -->
 <g id="edge7" class="edge">
-<title>u0&#45;&gt;u27</title>
-<path fill="none" stroke="black" d="M460,-990.77C460,-969.02 460,-931.36 460,-905.6"/>
-<polygon fill="black" stroke="black" points="463.5,-905.37 460,-895.37 456.5,-905.37 463.5,-905.37"/>
+<title>u2&#45;&gt;u3</title>
+<path fill="none" stroke="black" d="M498.37,-286.01C479.01,-273.53 450.45,-255.12 428.91,-241.23"/>
+<polygon fill="black" stroke="black" points="430.75,-238.25 420.45,-235.78 426.95,-244.14 430.75,-238.25"/>
 </g>
-<!-- u1&#45;&gt;u23 -->
+<!-- u13&#45;&gt;u3 -->
 <g id="edge8" class="edge">
-<title>u1&#45;&gt;u23</title>
-<path fill="none" stroke="black" d="M314.9,-865.36C370.84,-844.64 489.16,-800.51 497,-795.04 506.26,-788.57 514.81,-779.64 521.75,-771.23"/>
-<polygon fill="black" stroke="black" points="524.7,-773.14 528.11,-763.11 519.19,-768.82 524.7,-773.14"/>
+<title>u13&#45;&gt;u3</title>
+<path fill="none" stroke="black" d="M144.85,-290.31C198.89,-275.78 300.93,-248.33 357.9,-233.01"/>
+<polygon fill="black" stroke="black" points="358.91,-236.36 367.66,-230.38 357.09,-229.6 358.91,-236.36"/>
 </g>
-<!-- u3&#45;&gt;u4 -->
+<!-- u14&#45;&gt;u5 -->
 <g id="edge9" class="edge">
-<title>u3&#45;&gt;u4</title>
-<path fill="none" stroke="black" d="M451.1,-328.52C434.5,-303.34 402.74,-255.21 383.36,-225.83"/>
-<polygon fill="black" stroke="black" points="386.2,-223.78 377.77,-217.36 380.36,-227.64 386.2,-223.78"/>
+<title>u14&#45;&gt;u5</title>
+<path fill="none" stroke="black" d="M492.36,-469.49C485.88,-461.9 478.78,-452.48 474,-442.95 458.54,-412.12 468.2,-399.39 454,-367.95 447.34,-353.21 437.53,-338.1 428.85,-326.06"/>
+<polygon fill="black" stroke="black" points="431.57,-323.84 422.81,-317.89 425.94,-328.01 431.57,-323.84"/>
 </g>
-<!-- u15&#45;&gt;u20 -->
-<g id="edge11" class="edge">
-<title>u15&#45;&gt;u20</title>
-<path fill="none" stroke="black" d="M1106.22,-728.21C1125.98,-689.79 1168.17,-593.22 1137,-520.04 1107.21,-450.08 1033.73,-394.77 990.42,-366.88"/>
-<polygon fill="black" stroke="black" points="992.25,-363.89 981.93,-361.51 988.51,-369.81 992.25,-363.89"/>
-</g>
-<!-- u15&#45;&gt;u21 -->
-<g id="edge12" class="edge">
-<title>u15&#45;&gt;u21</title>
-<path fill="none" stroke="black" d="M1082.5,-728.68C1063.49,-706.61 1029.96,-665.48 1008,-626.04 998.71,-609.35 990.88,-589.31 985.41,-573.59"/>
-<polygon fill="black" stroke="black" points="988.68,-572.32 982.17,-563.96 982.05,-574.56 988.68,-572.32"/>
-</g>
-<!-- u15&#45;&gt;u16 -->
+<!-- u14&#45;&gt;u12 -->
 <g id="edge10" class="edge">
-<title>u15&#45;&gt;u16</title>
-<path fill="none" stroke="black" d="M1075.74,-729.5C1027.53,-694.28 909.88,-608.32 855.04,-568.25"/>
-<polygon fill="black" stroke="black" points="856.93,-565.3 846.79,-562.23 852.8,-570.95 856.93,-565.3"/>
+<title>u14&#45;&gt;u12</title>
+<path fill="none" stroke="black" d="M534.95,-471.89C543.43,-467.9 552.95,-463.86 562,-460.95 602.92,-447.83 621.35,-466.95 657,-442.95 665.13,-437.48 671.61,-429.08 676.49,-420.83"/>
+<polygon fill="black" stroke="black" points="679.72,-422.21 681.33,-411.74 673.54,-418.92 679.72,-422.21"/>
 </g>
-<!-- u22&#45;&gt;u3 -->
-<g id="edge13" class="edge">
-<title>u22&#45;&gt;u3</title>
-<path fill="none" stroke="black" d="M957.08,-730.89C949.51,-726.98 941.06,-723.01 933,-720.04 764.92,-658 670.23,-750.13 541,-626.04 469.68,-557.55 461.3,-429.93 461.26,-374.22"/>
-<polygon fill="black" stroke="black" points="464.76,-374.11 461.34,-364.08 457.76,-374.05 464.76,-374.11"/>
+<!-- u18 -->
+<g id="node20" class="node">
+<title>u18</title>
+<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="109" cy="-393.95" rx="73.39" ry="18"/>
+<text text-anchor="middle" x="109" y="-390.25" font-family="Times-Roman" font-size="14.00">Requirements</text>
 </g>
-<!-- u24&#45;&gt;u23 -->
-<g id="edge14" class="edge">
-<title>u24&#45;&gt;u23</title>
-<path fill="none" stroke="black" d="M539,-858.91C539,-837.32 539,-799.95 539,-774.39"/>
-<polygon fill="black" stroke="black" points="542.5,-774.24 539,-764.24 535.5,-774.24 542.5,-774.24"/>
+<!-- u18&#45;&gt;u5 -->
+<g id="edge12" class="edge">
+<title>u18&#45;&gt;u5</title>
+<path fill="none" stroke="black" d="M147.73,-378.58C159.84,-374.58 173.34,-370.6 186,-367.95 265.56,-351.31 295.73,-387.15 368,-349.95 378.45,-344.58 387.45,-335.41 394.41,-326.53"/>
+<polygon fill="black" stroke="black" points="397.39,-328.37 400.44,-318.22 391.73,-324.26 397.39,-328.37"/>
 </g>
-<!-- u25&#45;&gt;u23 -->
-<g id="edge15" class="edge">
-<title>u25&#45;&gt;u23</title>
-<path fill="none" stroke="black" d="M609.91,-859.96C596.02,-837.85 570.9,-797.84 554.59,-771.86"/>
-<polygon fill="black" stroke="black" points="557.5,-769.92 549.22,-763.32 551.58,-773.65 557.5,-769.92"/>
+<!-- u18&#45;&gt;u13 -->
+<g id="edge11" class="edge">
+<title>u18&#45;&gt;u13</title>
+<path fill="none" stroke="black" d="M109,-375.84C109,-362.75 109,-344.43 109,-329.32"/>
+<polygon fill="black" stroke="black" points="112.5,-328.99 109,-318.99 105.5,-328.99 112.5,-328.99"/>
 </g>
-<!-- u26&#45;&gt;u23 -->
-<g id="edge16" class="edge">
-<title>u26&#45;&gt;u23</title>
-<path fill="none" stroke="black" d="M399.92,-863.01C425.04,-848.19 465.9,-822.47 497,-795.04 505.22,-787.78 513.36,-778.96 520.26,-770.87"/>
-<polygon fill="black" stroke="black" points="523.01,-773.04 526.7,-763.11 517.62,-768.57 523.01,-773.04"/>
+<!-- u20 -->
+<g id="node21" class="node">
+<title>u20</title>
+<ellipse fill="#bbffbb" stroke="black" stroke-width="0" cx="627" cy="-769.95" rx="32.49" ry="18"/>
+<text text-anchor="middle" x="627" y="-766.25" font-family="Times-Roman" font-size="14.00">Main</text>
 </g>
-<!-- u27&#45;&gt;u23 -->
-<g id="edge17" class="edge">
-<title>u27&#45;&gt;u23</title>
-<path fill="none" stroke="black" d="M469.85,-859.96C483.39,-837.85 507.89,-797.84 523.79,-771.86"/>
-<polygon fill="black" stroke="black" points="526.79,-773.67 529.03,-763.32 520.82,-770.02 526.79,-773.67"/>
+<!-- u21 -->
+<g id="node22" class="node">
+<title>u21</title>
+<ellipse fill="#bbffbb" stroke="black" stroke-width="0" cx="627" cy="-689.95" rx="46.29" ry="18"/>
+<text text-anchor="middle" x="627" y="-686.25" font-family="Times-Roman" font-size="14.00">Validate</text>
 </g>
-<!-- u29 -->
-<g id="node32" class="node">
-<title>u29</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="1078" cy="-546.04" rx="50.09" ry="18"/>
-<text text-anchor="middle" x="1078" y="-542.34" font-family="Times,serif" font-size="14.00">Prompts</text>
-</g>
-<!-- u29&#45;&gt;u18 -->
-<g id="edge18" class="edge">
-<title>u29&#45;&gt;u18</title>
-<path fill="none" stroke="black" d="M1046.17,-532.12C1036.49,-528.21 1025.82,-523.93 1016,-520.04 909.13,-477.65 865.61,-496.8 775,-426.04 756.67,-411.72 741.79,-389.8 731.99,-372.67"/>
-<polygon fill="black" stroke="black" points="734.96,-370.81 727.08,-363.74 728.83,-374.19 734.96,-370.81"/>
-</g>
-<!-- u30 -->
-<g id="node33" class="node">
-<title>u30</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="1015" cy="-877.04" rx="76.09" ry="18"/>
-<text text-anchor="middle" x="1015" y="-873.34" font-family="Times,serif" font-size="14.00">Requirements</text>
-</g>
-<!-- u30&#45;&gt;u22 -->
-<g id="edge19" class="edge">
-<title>u30&#45;&gt;u22</title>
-<path fill="none" stroke="black" d="M1010.62,-858.91C1005.07,-837.22 995.45,-799.61 988.91,-774.05"/>
-<polygon fill="black" stroke="black" points="992.27,-773.06 986.4,-764.24 985.49,-774.79 992.27,-773.06"/>
-</g>
-<!-- u33 -->
-<g id="node34" class="node">
-<title>u33</title>
-<ellipse fill="#bbffbb" stroke="black" stroke-width="0" cx="1198" cy="-1009.04" rx="34.39" ry="18"/>
-<text text-anchor="middle" x="1198" y="-1005.34" font-family="Times,serif" font-size="14.00">Main</text>
-</g>
-<!-- u33&#45;&gt;u24 -->
+<!-- u20&#45;&gt;u21 -->
 <g id="edge1" class="edge">
-<title>u33&#45;&gt;u24</title>
-<path fill="none" stroke="black" d="M1173.88,-995.92C1169.36,-994.03 1164.6,-992.29 1160,-991.04 909.74,-922.81 809.14,-1047.6 580,-926.04 569.88,-920.66 561.18,-911.67 554.44,-902.91"/>
-<polygon fill="black" stroke="black" points="557.24,-900.82 548.59,-894.71 551.55,-904.88 557.24,-900.82"/>
+<title>u20&#45;&gt;u21</title>
+<path fill="none" stroke="black" d="M627,-751.64C627,-741.85 627,-729.38 627,-718.29"/>
+<polygon fill="black" stroke="black" points="630.5,-718.22 627,-708.22 623.5,-718.22 630.5,-718.22"/>
 </g>
-<!-- u33&#45;&gt;u25 -->
+<!-- u21&#45;&gt;u0 -->
 <g id="edge2" class="edge">
-<title>u33&#45;&gt;u25</title>
-<path fill="none" stroke="black" d="M1173.86,-995.98C1169.34,-994.09 1164.59,-992.33 1160,-991.04 943.03,-929.91 852.47,-1038.29 657,-926.04 647.56,-920.61 639.7,-911.73 633.69,-903.07"/>
-<polygon fill="black" stroke="black" points="636.64,-901.17 628.31,-894.62 630.73,-904.93 636.64,-901.17"/>
+<title>u21&#45;&gt;u0</title>
+<path fill="none" stroke="black" d="M627,-671.56C627,-660.73 627,-646.56 627,-634.25"/>
+<polygon fill="black" stroke="black" points="630.5,-634.04 627,-624.04 623.5,-634.04 630.5,-634.04"/>
 </g>
 </g>
 </svg>

docs/modules_wide.svg

@@ -1,536 +1,366 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 5.0.0 (0)
+<!-- Generated by graphviz version 2.44.0 (0)
  -->
 <!-- Title: G Pages: 1 -->
-<svg width="1076pt" height="648pt"
- viewBox="0.00 0.00 1075.76 648.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(0.867238 0.867238) rotate(0) translate(4 743.2)">
+<svg width="1075pt" height="648pt"
+ viewBox="0.00 0.00 1075.16 648.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(0.91 0.91) rotate(0) translate(4 710)">
 <title>G</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-743.2 1236.45,-743.2 1236.45,4 -4,4"/>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-710 1180.67,-710 1180.67,4 -4,4"/>
 <g id="clust1" class="cluster">
 <title>cluster_0</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="8,-9.36 8,-729.84 1156,-729.84 1156,-9.36 8,-9.36"/>
-<text text-anchor="middle" x="582" y="-714.64" font-family="Times,serif" font-size="14.00">GHCup</text>
+<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="10.72,-8 10.72,-590 1165.95,-590 1165.95,-8 10.72,-8"/>
+<text text-anchor="middle" x="588.33" y="-574.8" font-family="Times-Roman" font-size="14.00">GHCup</text>
 </g>
 <g id="clust2" class="cluster">
 <title>cluster_1</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="661,-466.68 661,-642.12 929,-642.12 929,-466.68 661,-466.68"/>
-<text text-anchor="middle" x="795" y="-626.92" font-family="Times,serif" font-size="14.00">Download</text>
+<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="254.63,-326 254.63,-484 603.08,-484 603.08,-326 254.63,-326"/>
+<text text-anchor="middle" x="428.85" y="-468.8" font-family="Times-Roman" font-size="14.00">Download</text>
 </g>
 <g id="clust3" class="cluster">
 <title>cluster_2</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="545,-18.71 545,-457.32 1020,-457.32 1020,-18.71 545,-18.71"/>
-<text text-anchor="middle" x="782.5" y="-442.12" font-family="Times,serif" font-size="14.00">Prelude</text>
+<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="363.19,-171 363.19,-318 605.76,-318 605.76,-171 363.19,-171"/>
+<text text-anchor="middle" x="484.47" y="-302.8" font-family="Times-Roman" font-size="14.00">Types</text>
 </g>
 <g id="clust4" class="cluster">
 <title>cluster_3</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="558,-102.93 558,-190.65 735,-190.65 735,-102.93 558,-102.93"/>
-<text text-anchor="middle" x="646.5" y="-175.45" font-family="Times,serif" font-size="14.00">File</text>
+<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="758.53,-16 758.53,-515 1155.22,-515 1155.22,-16 758.53,-16"/>
+<text text-anchor="middle" x="956.88" y="-499.8" font-family="Times-Roman" font-size="14.00">Utils</text>
 </g>
 <g id="clust5" class="cluster">
 <title>cluster_4</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="553,-200.01 553,-287.73 771,-287.73 771,-200.01 553,-200.01"/>
-<text text-anchor="middle" x="662" y="-272.53" font-family="Times,serif" font-size="14.00">Logger</text>
+<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="857.71,-243 857.71,-401 1015.85,-401 1015.85,-243 857.71,-243"/>
+<text text-anchor="middle" x="936.78" y="-385.8" font-family="Times-Roman" font-size="14.00">File</text>
 </g>
 <g id="clust6" class="cluster">
 <title>cluster_5</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="779,-200.01 779,-287.73 1012,-287.73 1012,-200.01 779,-200.01"/>
-<text text-anchor="middle" x="895.5" y="-272.53" font-family="Times,serif" font-size="14.00">Process</text>
+<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="781.32,-24 781.32,-99 875.13,-99 875.13,-24 781.32,-24"/>
+<text text-anchor="middle" x="828.22" y="-83.8" font-family="Times-Roman" font-size="14.00">String</text>
 </g>
 <g id="clust7" class="cluster">
 <title>cluster_6</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="699,-333.34 699,-421.06 769,-421.06 769,-333.34 699,-333.34"/>
-<text text-anchor="middle" x="734" y="-405.86" font-family="Times,serif" font-size="14.00">String</text>
-</g>
-<g id="clust8" class="cluster">
-<title>cluster_7</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="942,-333.34 942,-421.06 1012,-421.06 1012,-333.34 942,-333.34"/>
-<text text-anchor="middle" x="977" y="-405.86" font-family="Times,serif" font-size="14.00">Version</text>
-</g>
-<g id="clust9" class="cluster">
-<title>cluster_8</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="16,-93.57 16,-323.98 413,-323.98 413,-93.57 16,-93.57"/>
-<text text-anchor="middle" x="214.5" y="-308.78" font-family="Times,serif" font-size="14.00">Types</text>
-</g>
-<g id="clust10" class="cluster">
-<title>cluster_9</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="24,-102.93 24,-287.73 230,-287.73 230,-102.93 24,-102.93"/>
-<text text-anchor="middle" x="127" y="-272.53" font-family="Times,serif" font-size="14.00">JSON</text>
-</g>
-<g id="clust11" class="cluster">
-<title>cluster_10</title>
-<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="418,-466.68 418,-554.4 580,-554.4 580,-466.68 418,-466.68"/>
-<text text-anchor="middle" x="499" y="-539.2" font-family="Times,serif" font-size="14.00">Utils</text>
-</g>
-<!-- u2 -->
-<g id="node1" class="node">
-<title>u2</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="2" cx="864" cy="-584.36" rx="56.59" ry="18"/>
-<text text-anchor="middle" x="864" y="-580.66" font-family="Times,serif" font-size="14.00">Download</text>
-</g>
-<!-- u15 -->
-<g id="node26" class="node">
-<title>u15</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="1097" cy="-497.36" rx="51.19" ry="18"/>
-<text text-anchor="middle" x="1097" y="-493.66" font-family="Times,serif" font-size="14.00">Platform</text>
-</g>
-<!-- u2&#45;&gt;u15 -->
-<g id="edge20" class="edge">
-<title>u2&#45;&gt;u15</title>
-<path fill="none" stroke="black" d="M904.22,-571.57C911.13,-569.72 918.25,-567.9 925,-566.36 973.86,-555.17 990.28,-566.91 1036,-546.36 1049.52,-540.28 1062.68,-530.57 1073.29,-521.46"/>
-<polygon fill="black" stroke="black" points="1075.75,-523.96 1080.88,-514.69 1071.09,-518.74 1075.75,-523.96"/>
-</g>
-<!-- u22 -->
-<g id="node27" class="node">
-<title>u22</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="982" cy="-497.36" rx="45.49" ry="18"/>
-<text text-anchor="middle" x="982" y="-493.66" font-family="Times,serif" font-size="14.00">Version</text>
-</g>
-<!-- u2&#45;&gt;u22 -->
-<g id="edge21" class="edge">
-<title>u2&#45;&gt;u22</title>
-<path fill="none" stroke="black" d="M895,-569.1C907.3,-562.85 921.28,-554.97 933,-546.36 942.7,-539.23 952.38,-530.25 960.54,-521.99"/>
-<polygon fill="black" stroke="black" points="963.16,-524.32 967.56,-514.68 958.11,-519.47 963.16,-524.32"/>
-</g>
-<!-- u28 -->
-<g id="node2" class="node">
-<title>u28</title>
-<ellipse fill="#bbbbff" stroke="black" stroke-width="0" cx="777" cy="-497.36" rx="33.29" ry="18"/>
-<text text-anchor="middle" x="777" y="-493.66" font-family="Times,serif" font-size="14.00">Utils</text>
-</g>
-<!-- u16 -->
-<g id="node12" class="node">
-<title>u16</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="2" cx="826" cy="-363.36" rx="46.59" ry="18"/>
-<text text-anchor="middle" x="826" y="-359.66" font-family="Times,serif" font-size="14.00">Prelude</text>
-</g>
-<!-- u28&#45;&gt;u16 -->
-<g id="edge22" class="edge">
-<title>u28&#45;&gt;u16</title>
-<path fill="none" stroke="black" d="M783.21,-479.64C791.52,-457.25 806.36,-417.27 816.19,-390.78"/>
-<polygon fill="black" stroke="black" points="819.49,-391.95 819.69,-381.36 812.93,-389.51 819.49,-391.95"/>
-</g>
-<!-- u31 -->
-<g id="node3" class="node">
-<title>u31</title>
-<ellipse fill="#bbbbff" stroke="black" stroke-width="0" cx="729" cy="-584.36" rx="60.39" ry="18"/>
-<text text-anchor="middle" x="729" y="-580.66" font-family="Times,serif" font-size="14.00">IOStreams</text>
-</g>
-<!-- u31&#45;&gt;u28 -->
-<g id="edge23" class="edge">
-<title>u31&#45;&gt;u28</title>
-<path fill="none" stroke="black" d="M738.48,-566.56C745.36,-554.38 754.8,-537.67 762.61,-523.85"/>
-<polygon fill="black" stroke="black" points="765.83,-525.25 767.7,-514.83 759.73,-521.81 765.83,-525.25"/>
-</g>
-<!-- u19 -->
-<g id="node4" class="node">
-<title>u19</title>
-<ellipse fill="#ffbbbb" stroke="black" stroke-width="2" cx="595" cy="-133.36" rx="28.7" ry="18"/>
-<text text-anchor="middle" x="595" y="-129.66" font-family="Times,serif" font-size="14.00">File</text>
-</g>
-<!-- u17 -->
-<g id="node14" class="node">
-<title>u17</title>
-<ellipse fill="#ffbbbb" stroke="black" stroke-width="0" cx="601" cy="-49.36" rx="48.19" ry="18"/>
-<text text-anchor="middle" x="601" y="-45.66" font-family="Times,serif" font-size="14.00">Internal</text>
-</g>
-<!-- u19&#45;&gt;u17 -->
-<g id="edge27" class="edge">
-<title>u19&#45;&gt;u17</title>
-<path fill="none" stroke="black" d="M596.24,-115.37C597.03,-104.55 598.08,-90.3 598.98,-77.9"/>
-<polygon fill="black" stroke="black" points="602.5,-77.84 599.74,-67.61 595.52,-77.33 602.5,-77.84"/>
-</g>
-<!-- u3 -->
-<g id="node25" class="node">
-<title>u3</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="462" cy="-230.36" rx="40.89" ry="18"/>
-<text text-anchor="middle" x="462" y="-226.66" font-family="Times,serif" font-size="14.00">Errors</text>
-</g>
-<!-- u19&#45;&gt;u3 -->
-<g id="edge26" class="edge">
-<title>u19&#45;&gt;u3</title>
-<path fill="none" stroke="black" d="M576.84,-147.33C554.7,-163.14 517,-190.07 490.87,-208.74"/>
-<polygon fill="black" stroke="black" points="488.59,-206.06 482.49,-214.72 492.66,-211.76 488.59,-206.06"/>
-</g>
-<!-- u12 -->
-<g id="node5" class="node">
-<title>u12</title>
-<ellipse fill="#bbffff" stroke="black" stroke-width="0" cx="684" cy="-133.36" rx="42.79" ry="18"/>
-<text text-anchor="middle" x="684" y="-129.66" font-family="Times,serif" font-size="14.00">Search</text>
-</g>
-<!-- u4 -->
-<g id="node18" class="node">
-<title>u4</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="2" cx="367" cy="-133.36" rx="38.19" ry="18"/>
-<text text-anchor="middle" x="367" y="-129.66" font-family="Times,serif" font-size="14.00">Types</text>
-</g>
-<!-- u12&#45;&gt;u4 -->
-<g id="edge28" class="edge">
-<title>u12&#45;&gt;u4</title>
-<path fill="none" stroke="black" d="M672.58,-150.78C661.96,-165.24 644.69,-184.79 624,-193.36 584.82,-209.58 467.94,-170.98 406.21,-148.35"/>
-<polygon fill="black" stroke="black" points="407.38,-145.05 396.79,-144.87 404.96,-151.62 407.38,-145.05"/>
-</g>
-<!-- u18 -->
-<g id="node6" class="node">
-<title>u18</title>
-<ellipse fill="#ffbbbb" stroke="black" stroke-width="2" cx="719" cy="-230.36" rx="43.59" ry="18"/>
-<text text-anchor="middle" x="719" y="-226.66" font-family="Times,serif" font-size="14.00">Logger</text>
-</g>
-<!-- u18&#45;&gt;u19 -->
-<g id="edge29" class="edge">
-<title>u18&#45;&gt;u19</title>
-<path fill="none" stroke="black" d="M691.65,-216.15C669.99,-205.4 641.81,-190.7 632,-182.36 624.03,-175.58 616.67,-166.82 610.64,-158.65"/>
-<polygon fill="black" stroke="black" points="613.49,-156.62 604.88,-150.45 607.77,-160.64 613.49,-156.62"/>
-</g>
-<!-- u14 -->
-<g id="node7" class="node">
-<title>u14</title>
-<ellipse fill="#ffbbff" stroke="black" stroke-width="0" cx="609" cy="-230.36" rx="48.19" ry="18"/>
-<text text-anchor="middle" x="609" y="-226.66" font-family="Times,serif" font-size="14.00">Internal</text>
-</g>
-<!-- u14&#45;&gt;u4 -->
-<g id="edge30" class="edge">
-<title>u14&#45;&gt;u4</title>
-<path fill="none" stroke="black" d="M577.11,-216.84C532.69,-199.4 452.29,-167.84 404.87,-149.22"/>
-<polygon fill="black" stroke="black" points="406.15,-145.97 395.56,-145.57 403.59,-152.48 406.15,-145.97"/>
-</g>
-<!-- u20 -->
-<g id="node8" class="node">
-<title>u20</title>
-<ellipse fill="#ffbbbb" stroke="black" stroke-width="2" cx="957" cy="-230.36" rx="46.59" ry="18"/>
-<text text-anchor="middle" x="957" y="-226.66" font-family="Times,serif" font-size="14.00">Process</text>
-</g>
-<!-- u32 -->
-<g id="node9" class="node">
-<title>u32</title>
-<ellipse fill="#77ff77" stroke="black" stroke-width="0" cx="840" cy="-230.36" rx="52.79" ry="18"/>
-<text text-anchor="middle" x="840" y="-226.66" font-family="Times,serif" font-size="14.00">Windows</text>
-</g>
-<!-- u32&#45;&gt;u12 -->
-<g id="edge31" class="edge">
-<title>u32&#45;&gt;u12</title>
-<path fill="none" stroke="black" d="M815.28,-214.3C788.42,-197.95 745.41,-171.75 715.99,-153.84"/>
-<polygon fill="black" stroke="black" points="717.69,-150.78 707.33,-148.56 714.05,-156.75 717.69,-150.78"/>
-</g>
-<!-- u13 -->
-<g id="node10" class="node">
-<title>u13</title>
-<ellipse fill="#ffff77" stroke="black" stroke-width="0" cx="734" cy="-363.36" rx="27" ry="18"/>
-<text text-anchor="middle" x="734" y="-359.66" font-family="Times,serif" font-size="14.00">QQ</text>
-</g>
-<!-- u21 -->
-<g id="node11" class="node">
-<title>u21</title>
-<ellipse fill="#7777ff" stroke="black" stroke-width="0" cx="977" cy="-363.36" rx="27" ry="18"/>
-<text text-anchor="middle" x="977" y="-359.66" font-family="Times,serif" font-size="14.00">QQ</text>
-</g>
-<!-- u16&#45;&gt;u18 -->
-<g id="edge24" class="edge">
-<title>u16&#45;&gt;u18</title>
-<path fill="none" stroke="black" d="M808.76,-346.13C798.53,-336.18 785.54,-322.97 775,-310.36 760.67,-293.21 746.13,-272.57 735.45,-256.69"/>
-<polygon fill="black" stroke="black" points="738.09,-254.35 729.64,-247.95 732.26,-258.22 738.09,-254.35"/>
-</g>
-<!-- u10 -->
-<g id="node13" class="node">
-<title>u10</title>
-<ellipse fill="#ffbbbb" stroke="black" stroke-width="0" cx="621" cy="-363.36" rx="67.69" ry="18"/>
-<text text-anchor="middle" x="621" y="-359.66" font-family="Times,serif" font-size="14.00">MegaParsec</text>
-</g>
-<!-- u10&#45;&gt;u4 -->
-<g id="edge25" class="edge">
-<title>u10&#45;&gt;u4</title>
-<path fill="none" stroke="black" d="M591.45,-347.12C576.78,-338.2 559.92,-325.68 549,-310.36 520.44,-270.28 549.21,-241.56 517,-204.36 489.55,-172.66 444.67,-154.35 411.14,-144.47"/>
-<polygon fill="black" stroke="black" points="411.7,-141 401.13,-141.67 409.81,-147.74 411.7,-141"/>
-</g>
-<!-- u8 -->
-<g id="node15" class="node">
-<title>u8</title>
-<ellipse fill="#ff7777" stroke="black" stroke-width="2" cx="68" cy="-230.36" rx="36" ry="18"/>
-<text text-anchor="middle" x="68" y="-226.66" font-family="Times,serif" font-size="14.00">JSON</text>
-</g>
-<!-- u8&#45;&gt;u10 -->
-<g id="edge35" class="edge">
-<title>u8&#45;&gt;u10</title>
-<path fill="none" stroke="black" d="M72.64,-248.48C78.64,-267.08 91.05,-296.05 113,-310.36 148.38,-333.41 412.5,-350.95 545.27,-358.42"/>
-<polygon fill="black" stroke="black" points="545.2,-361.92 555.38,-358.98 545.59,-354.93 545.2,-361.92"/>
-</g>
-<!-- u9 -->
-<g id="node17" class="node">
-<title>u9</title>
-<ellipse fill="#77ffff" stroke="black" stroke-width="0" cx="68" cy="-133.36" rx="33.29" ry="18"/>
-<text text-anchor="middle" x="68" y="-129.66" font-family="Times,serif" font-size="14.00">Utils</text>
-</g>
-<!-- u8&#45;&gt;u9 -->
-<g id="edge37" class="edge">
-<title>u8&#45;&gt;u9</title>
-<path fill="none" stroke="black" d="M68,-211.93C68,-198.01 68,-178.22 68,-162.11"/>
-<polygon fill="black" stroke="black" points="71.5,-161.67 68,-151.67 64.5,-161.67 71.5,-161.67"/>
-</g>
-<!-- u5 -->
-<g id="node19" class="node">
-<title>u5</title>
-<ellipse fill="#ff7777" stroke="black" stroke-width="0" cx="274" cy="-133.36" rx="36.29" ry="18"/>
-<text text-anchor="middle" x="274" y="-129.66" font-family="Times,serif" font-size="14.00">Stack</text>
-</g>
-<!-- u8&#45;&gt;u5 -->
-<g id="edge36" class="edge">
-<title>u8&#45;&gt;u5</title>
-<path fill="none" stroke="black" d="M89.29,-215.65C96.57,-211.48 104.92,-207.25 113,-204.36 164.47,-185.95 186.78,-209.89 234,-182.36 243.56,-176.78 251.85,-168.03 258.37,-159.52"/>
-<polygon fill="black" stroke="black" points="261.33,-161.39 264.27,-151.21 255.63,-157.33 261.33,-161.39"/>
-</g>
-<!-- u6 -->
-<g id="node16" class="node">
-<title>u6</title>
-<ellipse fill="#77ffff" stroke="black" stroke-width="0" cx="172" cy="-230.36" rx="50.09" ry="18"/>
-<text text-anchor="middle" x="172" y="-226.66" font-family="Times,serif" font-size="14.00">Versions</text>
-</g>
-<!-- u7 -->
-<g id="node22" class="node">
-<title>u7</title>
-<ellipse fill="#ff77ff" stroke="black" stroke-width="0" cx="457" cy="-497.36" rx="30.59" ry="18"/>
-<text text-anchor="middle" x="457" y="-493.66" font-family="Times,serif" font-size="14.00">Dirs</text>
-</g>
-<!-- u4&#45;&gt;u7 -->
-<g id="edge32" class="edge">
-<title>u4&#45;&gt;u7</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M374.54,-151.23C380.4,-165.18 388.15,-185.65 392,-204.36 413.44,-308.61 364.63,-345.72 407,-443.36 412.35,-455.69 421.87,-466.91 431.18,-475.82"/>
-<polygon fill="black" stroke="black" points="429.08,-478.65 438.86,-482.74 433.77,-473.45 429.08,-478.65"/>
-</g>
-<!-- u5&#45;&gt;u6 -->
-<g id="edge33" class="edge">
-<title>u5&#45;&gt;u6</title>
-<path fill="none" stroke="black" d="M261.88,-150.72C254.35,-160.39 244.2,-172.62 234,-182.36 224.46,-191.47 213.18,-200.47 202.87,-208.11"/>
-<polygon fill="black" stroke="black" points="200.53,-205.48 194.5,-214.19 204.65,-211.15 200.53,-205.48"/>
-</g>
-<!-- u11 -->
-<g id="node20" class="node">
-<title>u11</title>
-<ellipse fill="#ff7777" stroke="black" stroke-width="0" cx="343" cy="-230.36" rx="40.09" ry="18"/>
-<text text-anchor="middle" x="343" y="-226.66" font-family="Times,serif" font-size="14.00">Optics</text>
-</g>
-<!-- u11&#45;&gt;u4 -->
-<g id="edge34" class="edge">
-<title>u11&#45;&gt;u4</title>
-<path fill="none" stroke="black" d="M347.29,-212.37C350.85,-198.28 355.98,-177.96 360.12,-161.59"/>
-<polygon fill="black" stroke="black" points="363.61,-162.07 362.67,-151.51 356.82,-160.35 363.61,-162.07"/>
-</g>
-<!-- u23 -->
-<g id="node21" class="node">
-<title>u23</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="2" cx="539" cy="-497.36" rx="33.29" ry="18"/>
-<text text-anchor="middle" x="539" y="-493.66" font-family="Times,serif" font-size="14.00">Utils</text>
-</g>
-<!-- u23&#45;&gt;u2 -->
-<g id="edge38" class="edge">
-<title>u23&#45;&gt;u2</title>
-<path fill="none" stroke="black" d="M562.81,-510.07C586.22,-521.1 623.26,-537.25 657,-546.36 718.11,-562.85 735.92,-554 798,-566.36 802.75,-567.3 807.68,-568.38 812.59,-569.53"/>
-<polygon fill="black" stroke="black" points="812.07,-573 822.62,-571.95 813.72,-566.2 812.07,-573"/>
-</g>
-<!-- u7&#45;&gt;u12 -->
-<g id="edge40" class="edge">
-<title>u7&#45;&gt;u12</title>
-<path fill="none" stroke="black" d="M469.12,-480.58C476.19,-470.5 484.56,-456.83 489,-443.36 503.82,-398.42 475.34,-378.34 499,-337.36 509.36,-319.41 526.47,-328.2 537,-310.36 561.09,-269.52 517.96,-240.2 549,-204.36 574.26,-175.18 599.24,-201.05 633,-182.36 644.19,-176.16 654.79,-166.95 663.41,-158.26"/>
-<polygon fill="black" stroke="black" points="666.1,-160.5 670.42,-150.83 661.01,-155.69 666.1,-160.5"/>
-</g>
-<!-- u7&#45;&gt;u14 -->
-<g id="edge41" class="edge">
-<title>u7&#45;&gt;u14</title>
-<path fill="none" stroke="black" d="M471.16,-481C479.99,-470.86 491.13,-456.98 499,-443.36 524.34,-399.47 517.88,-382.45 541,-337.36 555.84,-308.42 576.39,-277.32 591.01,-256.34"/>
-<polygon fill="black" stroke="black" points="593.98,-258.2 596.88,-248.01 588.26,-254.17 593.98,-258.2"/>
-</g>
-<!-- u7&#45;&gt;u13 -->
-<g id="edge42" class="edge">
-<title>u7&#45;&gt;u13</title>
-<path fill="none" stroke="black" d="M475.28,-482.66C481.82,-478.39 489.45,-474.09 497,-471.36 583.9,-439.95 630.35,-500.44 703,-443.36 718.83,-430.92 726.59,-409.25 730.39,-391.75"/>
-<polygon fill="black" stroke="black" points="733.91,-391.98 732.28,-381.51 727.02,-390.71 733.91,-391.98"/>
-</g>
-<!-- u7&#45;&gt;u8 -->
-<g id="edge44" class="edge">
-<title>u7&#45;&gt;u8</title>
-<path fill="none" stroke="black" d="M430.56,-487.89C368.33,-466.83 210.54,-406.76 113,-310.36 97.8,-295.33 86.09,-274.1 78.43,-257.43"/>
-<polygon fill="black" stroke="black" points="81.61,-255.97 74.39,-248.22 75.2,-258.78 81.61,-255.97"/>
-</g>
-<!-- u7&#45;&gt;u11 -->
-<g id="edge43" class="edge">
-<title>u7&#45;&gt;u11</title>
-<path fill="none" stroke="black" d="M437.17,-483.6C423.89,-474.05 407.07,-459.84 397,-443.36 360.76,-384.02 348.73,-301.14 344.83,-258.73"/>
-<polygon fill="black" stroke="black" points="348.3,-258.29 343.98,-248.61 341.33,-258.87 348.3,-258.29"/>
-</g>
-<!-- u7&#45;&gt;u3 -->
-<g id="edge39" class="edge">
-<title>u7&#45;&gt;u3</title>
-<path fill="none" stroke="black" d="M457.33,-478.97C458.18,-433.94 460.45,-313.25 461.48,-258.74"/>
-<polygon fill="black" stroke="black" points="464.99,-258.53 461.68,-248.46 457.99,-258.4 464.99,-258.53"/>
-</g>
-<!-- u0 -->
-<g id="node23" class="node">
-<title>u0</title>
-<ellipse fill="#bbffbb" stroke="black" stroke-width="2" cx="460" cy="-672.36" rx="44.39" ry="18"/>
-<text text-anchor="middle" x="460" y="-668.66" font-family="Times,serif" font-size="14.00">GHCup</text>
+<polygon fill="#000000" fill-opacity="0.058824" stroke="#000000" stroke-opacity="0.058824" points="954.2,-409 954.2,-484 1048.01,-484 1048.01,-409 954.2,-409"/>
+<text text-anchor="middle" x="1001.1" y="-468.8" font-family="Times-Roman" font-size="14.00">Version</text>
 </g>
 <!-- u1 -->
-<g id="node24" class="node">
+<g id="node1" class="node">
 <title>u1</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="286" cy="-584.36" rx="37.09" ry="18"/>
-<text text-anchor="middle" x="286" y="-580.66" font-family="Times,serif" font-size="14.00">Cabal</text>
+<ellipse fill="#ffffbb" stroke="black" stroke-width="2" cx="518.39" cy="-435" rx="55.49" ry="18"/>
+<text text-anchor="middle" x="518.39" y="-431.3" font-family="Times-Roman" font-size="14.00">Download</text>
+</g>
+<!-- u12 -->
+<g id="node7" class="node">
+<title>u12</title>
+<ellipse fill="#bbffff" stroke="black" stroke-width="2" cx="922.39" cy="-352" rx="27" ry="18"/>
+<text text-anchor="middle" x="922.39" y="-348.3" font-family="Times-Roman" font-size="14.00">File</text>
+</g>
+<!-- u1&#45;&gt;u12 -->
+<g id="edge15" class="edge">
+<title>u1&#45;&gt;u12</title>
+<path fill="none" stroke="black" d="M546.79,-419.43C556.27,-415.25 567.06,-411.24 577.39,-409 594.44,-405.31 876.17,-409.54 891.39,-401 900.16,-396.08 906.84,-387.53 911.72,-379"/>
+<polygon fill="black" stroke="black" points="914.92,-380.43 916.31,-369.92 908.67,-377.26 914.92,-380.43"/>
+</g>
+<!-- u11 -->
+<g id="node15" class="node">
+<title>u11</title>
+<ellipse fill="#bbffff" stroke="black" stroke-width="0" cx="808.39" cy="-352" rx="28.7" ry="18"/>
+<text text-anchor="middle" x="808.39" y="-348.3" font-family="Times-Roman" font-size="14.00">Dirs</text>
+</g>
+<!-- u1&#45;&gt;u11 -->
+<g id="edge14" class="edge">
+<title>u1&#45;&gt;u11</title>
+<path fill="none" stroke="black" d="M548.95,-419.93C557.99,-416.08 567.99,-412.11 577.39,-409 586.69,-405.92 709.34,-376.59 772.03,-361.65"/>
+<polygon fill="black" stroke="black" points="772.99,-365.02 781.91,-359.3 771.37,-358.21 772.99,-365.02"/>
+</g>
+<!-- u13 -->
+<g id="node18" class="node">
+<title>u13</title>
+<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="146.39" cy="-269" rx="44.39" ry="18"/>
+<text text-anchor="middle" x="146.39" y="-265.3" font-family="Times-Roman" font-size="14.00">Version</text>
+</g>
+<!-- u1&#45;&gt;u13 -->
+<g id="edge13" class="edge">
+<title>u1&#45;&gt;u13</title>
+<path fill="none" stroke="black" d="M477.97,-422.58C457.84,-417.42 433.02,-411.85 410.39,-409 400.85,-407.8 71.11,-407.88 64.39,-401 41.09,-377.16 48.83,-355.48 64.39,-326 73.49,-308.76 90.55,-295.83 106.76,-286.76"/>
+<polygon fill="black" stroke="black" points="108.39,-289.86 115.62,-282.11 105.14,-283.66 108.39,-289.86"/>
+</g>
+<!-- u17 -->
+<g id="node2" class="node">
+<title>u17</title>
+<ellipse fill="#bbbbff" stroke="black" stroke-width="0" cx="445.39" cy="-352" rx="30.59" ry="18"/>
+<text text-anchor="middle" x="445.39" y="-348.3" font-family="Times-Roman" font-size="14.00">Utils</text>
+</g>
+<!-- u5 -->
+<g id="node6" class="node">
+<title>u5</title>
+<ellipse fill="#ffbbbb" stroke="black" stroke-width="0" cx="549.39" cy="-269" rx="33.6" ry="18"/>
+<text text-anchor="middle" x="549.39" y="-265.3" font-family="Times-Roman" font-size="14.00">JSON</text>
+</g>
+<!-- u17&#45;&gt;u5 -->
+<g id="edge16" class="edge">
+<title>u17&#45;&gt;u5</title>
+<path fill="none" stroke="black" d="M463.03,-337.26C479.49,-324.44 504.26,-305.15 523.05,-290.51"/>
+<polygon fill="black" stroke="black" points="525.22,-293.26 530.96,-284.35 520.92,-287.74 525.22,-293.26"/>
+</g>
+<!-- u19 -->
+<g id="node3" class="node">
+<title>u19</title>
+<ellipse fill="#bbbbff" stroke="black" stroke-width="0" cx="343.39" cy="-435" rx="57.69" ry="18"/>
+<text text-anchor="middle" x="343.39" y="-431.3" font-family="Times-Roman" font-size="14.00">IOStreams</text>
+</g>
+<!-- u19&#45;&gt;u17 -->
+<g id="edge17" class="edge">
+<title>u19&#45;&gt;u17</title>
+<path fill="none" stroke="black" d="M378.72,-420.5C389.55,-415.38 401.06,-408.84 410.39,-401 418.16,-394.47 425.12,-385.87 430.76,-377.75"/>
+<polygon fill="black" stroke="black" points="433.77,-379.54 436.33,-369.25 427.92,-375.7 433.77,-379.54"/>
+</g>
+<!-- u3 -->
+<g id="node4" class="node">
+<title>u3</title>
+<ellipse fill="#ffffbb" stroke="black" stroke-width="2" cx="534.39" cy="-197" rx="36.29" ry="18"/>
+<text text-anchor="middle" x="534.39" y="-193.3" font-family="Times-Roman" font-size="14.00">Types</text>
+</g>
+<!-- u4 -->
+<g id="node5" class="node">
+<title>u4</title>
+<ellipse fill="#ffbbbb" stroke="black" stroke-width="0" cx="427.39" cy="-269" rx="39.79" ry="18"/>
+<text text-anchor="middle" x="427.39" y="-265.3" font-family="Times-Roman" font-size="14.00">Optics</text>
+</g>
+<!-- u4&#45;&gt;u3 -->
+<g id="edge18" class="edge">
+<title>u4&#45;&gt;u3</title>
+<path fill="none" stroke="black" d="M449.04,-253.83C464.95,-243.42 486.78,-229.15 504.37,-217.64"/>
+<polygon fill="black" stroke="black" points="506.68,-220.31 513.13,-211.91 502.85,-214.45 506.68,-220.31"/>
+</g>
+<!-- u6 -->
+<g id="node12" class="node">
+<title>u6</title>
+<ellipse fill="#bbffff" stroke="black" stroke-width="0" cx="855.39" cy="-435" rx="64.19" ry="18"/>
+<text text-anchor="middle" x="855.39" y="-431.3" font-family="Times-Roman" font-size="14.00">MegaParsec</text>
+</g>
+<!-- u5&#45;&gt;u6 -->
+<g id="edge19" class="edge">
+<title>u5&#45;&gt;u6</title>
+<path fill="none" stroke="black" d="M566.7,-284.68C579.52,-295.01 597.75,-308.62 615.39,-318 624.58,-322.89 630.09,-318.59 637.39,-326 662.15,-351.13 635.32,-379.63 663.39,-401 674.37,-409.36 773.88,-406.14 787.39,-409 795.7,-410.76 804.37,-413.33 812.61,-416.16"/>
+<polygon fill="black" stroke="black" points="811.46,-419.47 822.06,-419.57 813.84,-412.88 811.46,-419.47"/>
+</g>
+<!-- u7 -->
+<g id="node13" class="node">
+<title>u7</title>
+<ellipse fill="#bbffff" stroke="black" stroke-width="0" cx="828.39" cy="-197" rx="44.39" ry="18"/>
+<text text-anchor="middle" x="828.39" y="-193.3" font-family="Times-Roman" font-size="14.00">Prelude</text>
+</g>
+<!-- u5&#45;&gt;u7 -->
+<g id="edge20" class="edge">
+<title>u5&#45;&gt;u7</title>
+<path fill="none" stroke="black" d="M567.9,-253.71C573.85,-249.71 580.65,-245.72 587.39,-243 648.94,-218.19 724.91,-206.91 774.9,-201.88"/>
+<polygon fill="black" stroke="black" points="775.54,-205.33 785.16,-200.9 774.87,-198.36 775.54,-205.33"/>
+</g>
+<!-- u9 -->
+<g id="node8" class="node">
+<title>u9</title>
+<ellipse fill="#ffbbff" stroke="black" stroke-width="0" cx="936.39" cy="-269" rx="51.19" ry="18"/>
+<text text-anchor="middle" x="936.39" y="-265.3" font-family="Times-Roman" font-size="14.00">Common</text>
+</g>
+<!-- u12&#45;&gt;u9 -->
+<g id="edge30" class="edge">
+<title>u12&#45;&gt;u9</title>
+<path fill="none" stroke="black" d="M925.36,-333.82C927.2,-323.19 929.6,-309.31 931.69,-297.2"/>
+<polygon fill="black" stroke="black" points="935.17,-297.6 933.42,-287.15 928.27,-296.41 935.17,-297.6"/>
+</g>
+<!-- u9&#45;&gt;u7 -->
+<g id="edge31" class="edge">
+<title>u9&#45;&gt;u7</title>
+<path fill="none" stroke="black" d="M912.96,-252.81C897.32,-242.68 876.58,-229.24 859.56,-218.2"/>
+<polygon fill="black" stroke="black" points="861.33,-215.18 851.04,-212.68 857.53,-221.06 861.33,-215.18"/>
+</g>
+<!-- u10 -->
+<g id="node9" class="node">
+<title>u10</title>
+<ellipse fill="#77ff77" stroke="black" stroke-width="0" cx="828.39" cy="-50" rx="27" ry="18"/>
+<text text-anchor="middle" x="828.39" y="-46.3" font-family="Times-Roman" font-size="14.00">QQ</text>
+</g>
+<!-- u16 -->
+<g id="node10" class="node">
+<title>u16</title>
+<ellipse fill="#ffff77" stroke="black" stroke-width="0" cx="1001.39" cy="-435" rx="27" ry="18"/>
+<text text-anchor="middle" x="1001.39" y="-431.3" font-family="Times-Roman" font-size="14.00">QQ</text>
+</g>
+<!-- u15 -->
+<g id="node11" class="node">
+<title>u15</title>
+<ellipse fill="#ffffbb" stroke="black" stroke-width="2" cx="1103.39" cy="-435" rx="30.59" ry="18"/>
+<text text-anchor="middle" x="1103.39" y="-431.3" font-family="Times-Roman" font-size="14.00">Utils</text>
+</g>
+<!-- u15&#45;&gt;u12 -->
+<g id="edge22" class="edge">
+<title>u15&#45;&gt;u12</title>
+<path fill="none" stroke="black" d="M1080.91,-422.68C1072.07,-418.31 1061.8,-413.33 1052.39,-409 1019.33,-393.79 981.02,-377.44 954.59,-366.35"/>
+<polygon fill="black" stroke="black" points="955.66,-363.01 945.08,-362.38 952.96,-369.47 955.66,-363.01"/>
+</g>
+<!-- u15&#45;&gt;u11 -->
+<g id="edge21" class="edge">
+<title>u15&#45;&gt;u11</title>
+<path fill="none" stroke="black" d="M1082.81,-421.48C1073.8,-416.65 1062.9,-411.66 1052.39,-409 1009.49,-398.14 893.64,-419.41 853.39,-401 842.1,-395.84 832.28,-386.4 824.72,-377.25"/>
+<polygon fill="black" stroke="black" points="827.3,-374.87 818.44,-369.07 821.75,-379.13 827.3,-374.87"/>
+</g>
+<!-- u6&#45;&gt;u3 -->
+<g id="edge23" class="edge">
+<title>u6&#45;&gt;u3</title>
+<path fill="none" stroke="black" d="M817.86,-420.3C799.34,-413.36 779.12,-405.48 770.39,-401 716.1,-373.14 711.12,-350.84 655.39,-326 642.79,-320.38 635.87,-326.98 625.39,-318 597.74,-294.3 614.8,-271.71 592.39,-243 584.81,-233.29 574.68,-224.49 565.01,-217.31"/>
+<polygon fill="black" stroke="black" points="566.89,-214.35 556.71,-211.43 562.85,-220.06 566.89,-214.35"/>
+</g>
+<!-- u8 -->
+<g id="node14" class="node">
+<title>u8</title>
+<ellipse fill="#bbffff" stroke="black" stroke-width="0" cx="828.39" cy="-125" rx="42.49" ry="18"/>
+<text text-anchor="middle" x="828.39" y="-121.3" font-family="Times-Roman" font-size="14.00">Logger</text>
+</g>
+<!-- u7&#45;&gt;u8 -->
+<g id="edge25" class="edge">
+<title>u7&#45;&gt;u8</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M828.39,-178.7C828.39,-170.98 828.39,-161.71 828.39,-153.11"/>
+<polygon fill="black" stroke="black" points="831.89,-153.1 828.39,-143.1 824.89,-153.1 831.89,-153.1"/>
+</g>
+<!-- u2 -->
+<g id="node17" class="node">
+<title>u2</title>
+<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="696.39" cy="-269" rx="37.89" ry="18"/>
+<text text-anchor="middle" x="696.39" y="-265.3" font-family="Times-Roman" font-size="14.00">Errors</text>
+</g>
+<!-- u7&#45;&gt;u2 -->
+<g id="edge24" class="edge">
+<title>u7&#45;&gt;u2</title>
+<path fill="none" stroke="black" d="M802.53,-211.71C781.65,-222.79 752.12,-238.45 729.51,-250.44"/>
+<polygon fill="black" stroke="black" points="727.8,-247.38 720.6,-255.16 731.07,-253.57 727.8,-247.38"/>
+</g>
+<!-- u8&#45;&gt;u4 -->
+<g id="edge26" class="edge">
+<title>u8&#45;&gt;u4</title>
+<path fill="none" stroke="black" d="M786.3,-127.22C706.73,-130.23 537.84,-140.15 489.39,-171 463.54,-187.46 446.42,-218.99 436.84,-241.64"/>
+<polygon fill="black" stroke="black" points="433.54,-240.45 433.08,-251.04 440.04,-243.06 433.54,-240.45"/>
+</g>
+<!-- u8&#45;&gt;u9 -->
+<g id="edge27" class="edge">
+<title>u8&#45;&gt;u9</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M849.03,-140.76C859.52,-148.9 872,-159.65 881.39,-171 899.5,-192.89 914.92,-221.56 924.79,-242.04"/>
+<polygon fill="black" stroke="black" points="921.62,-243.54 929.04,-251.1 927.96,-240.56 921.62,-243.54"/>
+</g>
+<!-- u8&#45;&gt;u10 -->
+<g id="edge28" class="edge">
+<title>u8&#45;&gt;u10</title>
+<path fill="none" stroke="black" d="M828.39,-106.7C828.39,-98.25 828.39,-87.87 828.39,-78.37"/>
+<polygon fill="black" stroke="black" points="831.89,-78.18 828.39,-68.18 824.89,-78.18 831.89,-78.18"/>
+</g>
+<!-- u11&#45;&gt;u5 -->
+<g id="edge29" class="edge">
+<title>u11&#45;&gt;u5</title>
+<path fill="none" stroke="black" d="M781.07,-346.57C749.06,-341.43 694.42,-332.79 647.39,-326 620.76,-322.16 610.78,-331.29 587.39,-318 577.83,-312.56 569.78,-303.68 563.6,-295.02"/>
+<polygon fill="black" stroke="black" points="566.46,-293 558.04,-286.57 560.61,-296.85 566.46,-293"/>
+</g>
+<!-- u0 -->
+<g id="node16" class="node">
+<title>u0</title>
+<ellipse fill="#bbffbb" stroke="black" stroke-width="2" cx="840.39" cy="-541" rx="42.49" ry="18"/>
+<text text-anchor="middle" x="840.39" y="-537.3" font-family="Times-Roman" font-size="14.00">GHCup</text>
 </g>
 <!-- u0&#45;&gt;u1 -->
-<g id="edge3" class="edge">
-<title>u0&#45;&gt;u1</title>
-<path fill="none" stroke="black" d="M419.44,-664.9C393.11,-659.4 358.82,-649.71 332,-633.36 321.74,-627.1 312.22,-617.99 304.53,-609.39"/>
-<polygon fill="black" stroke="black" points="307.16,-607.08 298.01,-601.72 301.82,-611.61 307.16,-607.08"/>
-</g>
-<!-- u24 -->
-<g id="node28" class="node">
-<title>u24</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="539" cy="-584.36" rx="32.49" ry="18"/>
-<text text-anchor="middle" x="539" y="-580.66" font-family="Times,serif" font-size="14.00">GHC</text>
-</g>
-<!-- u0&#45;&gt;u24 -->
 <g id="edge4" class="edge">
-<title>u0&#45;&gt;u24</title>
-<path fill="none" stroke="black" d="M476.56,-655.36C483.33,-648.68 491.16,-640.76 498,-633.36 505.1,-625.67 512.61,-617.05 519.23,-609.25"/>
-<polygon fill="black" stroke="black" points="522.25,-611.1 526.01,-601.19 516.89,-606.59 522.25,-611.1"/>
+<title>u0&#45;&gt;u1</title>
+<path fill="none" stroke="black" d="M798.15,-540.08C733.62,-539.53 614.12,-535.65 577.39,-515 556.17,-503.07 540.32,-480.02 530.42,-461.88"/>
+<polygon fill="black" stroke="black" points="533.49,-460.2 525.79,-452.93 527.27,-463.42 533.49,-460.2"/>
 </g>
-<!-- u25 -->
-<g id="node29" class="node">
-<title>u25</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="620" cy="-584.36" rx="30.59" ry="18"/>
-<text text-anchor="middle" x="620" y="-580.66" font-family="Times,serif" font-size="14.00">HLS</text>
-</g>
-<!-- u0&#45;&gt;u25 -->
-<g id="edge5" class="edge">
-<title>u0&#45;&gt;u25</title>
-<path fill="none" stroke="black" d="M500.05,-664.63C524.66,-659.11 555.96,-649.5 580,-633.36 589.19,-627.19 597.4,-618.32 603.96,-609.87"/>
-<polygon fill="black" stroke="black" points="606.87,-611.83 609.95,-601.69 601.22,-607.7 606.87,-611.83"/>
-</g>
-<!-- u26 -->
-<g id="node30" class="node">
-<title>u26</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="377" cy="-584.36" rx="36.29" ry="18"/>
-<text text-anchor="middle" x="377" y="-580.66" font-family="Times,serif" font-size="14.00">Stack</text>
-</g>
-<!-- u0&#45;&gt;u26 -->
+<!-- u0&#45;&gt;u16 -->
 <g id="edge6" class="edge">
-<title>u0&#45;&gt;u26</title>
-<path fill="none" stroke="black" d="M443.98,-655.57C437.16,-648.78 429.14,-640.73 422,-633.36 414.25,-625.36 405.88,-616.49 398.48,-608.57"/>
-<polygon fill="black" stroke="black" points="400.84,-605.97 391.47,-601.04 395.72,-610.74 400.84,-605.97"/>
+<title>u0&#45;&gt;u16</title>
+<path fill="none" stroke="black" d="M881.32,-536.43C914.21,-532.8 957.04,-526.09 970.39,-515 985.87,-502.13 993.66,-480.49 997.55,-463.11"/>
+<polygon fill="black" stroke="black" points="1001.06,-463.44 999.51,-452.96 994.18,-462.12 1001.06,-463.44"/>
 </g>
-<!-- u27 -->
-<g id="node31" class="node">
-<title>u27</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="460" cy="-584.36" rx="28.7" ry="18"/>
-<text text-anchor="middle" x="460" y="-580.66" font-family="Times,serif" font-size="14.00">List</text>
+<!-- u0&#45;&gt;u15 -->
+<g id="edge5" class="edge">
+<title>u0&#45;&gt;u15</title>
+<path fill="none" stroke="black" d="M882.83,-539.21C936.42,-537.51 1024.95,-532.11 1052.39,-515 1071.91,-502.83 1085.39,-480.12 1093.57,-462.17"/>
+<polygon fill="black" stroke="black" points="1096.87,-463.35 1097.57,-452.78 1090.43,-460.6 1096.87,-463.35"/>
 </g>
-<!-- u0&#45;&gt;u27 -->
+<!-- u14 -->
+<g id="node19" class="node">
+<title>u14</title>
+<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="680.39" cy="-435" rx="48.19" ry="18"/>
+<text text-anchor="middle" x="680.39" y="-431.3" font-family="Times-Roman" font-size="14.00">Platform</text>
+</g>
+<!-- u0&#45;&gt;u14 -->
+<g id="edge3" class="edge">
+<title>u0&#45;&gt;u14</title>
+<path fill="none" stroke="black" d="M801.74,-533.4C786.24,-529.61 768.7,-523.78 754.39,-515 731.68,-501.06 711.42,-478.33 697.87,-460.82"/>
+<polygon fill="black" stroke="black" points="700.58,-458.59 691.78,-452.7 694.98,-462.8 700.58,-458.59"/>
+</g>
+<!-- u2&#45;&gt;u3 -->
 <g id="edge7" class="edge">
-<title>u0&#45;&gt;u27</title>
-<path fill="none" stroke="black" d="M460,-653.95C460,-642.1 460,-626.17 460,-612.65"/>
-<polygon fill="black" stroke="black" points="463.5,-612.44 460,-602.44 456.5,-612.44 463.5,-612.44"/>
+<title>u2&#45;&gt;u3</title>
+<path fill="none" stroke="black" d="M669.27,-256.28C642.05,-244.52 599.95,-226.33 570.04,-213.4"/>
+<polygon fill="black" stroke="black" points="571.35,-210.16 560.79,-209.41 568.58,-216.59 571.35,-210.16"/>
 </g>
-<!-- u1&#45;&gt;u23 -->
+<!-- u13&#45;&gt;u3 -->
 <g id="edge8" class="edge">
-<title>u1&#45;&gt;u23</title>
-<path fill="none" stroke="black" d="M313.41,-572.04C319.45,-569.88 325.88,-567.84 332,-566.36 403.8,-548.99 431.69,-580.88 497,-546.36 507.24,-540.95 516.12,-531.94 523.05,-523.19"/>
-<polygon fill="black" stroke="black" points="525.96,-525.13 529.07,-515 520.32,-520.98 525.96,-525.13"/>
+<title>u13&#45;&gt;u3</title>
+<path fill="none" stroke="black" d="M186.09,-260.84C259.14,-247.66 414.32,-219.66 490.43,-205.93"/>
+<polygon fill="black" stroke="black" points="491.41,-209.31 500.63,-204.09 490.17,-202.42 491.41,-209.31"/>
 </g>
-<!-- u3&#45;&gt;u4 -->
+<!-- u14&#45;&gt;u5 -->
 <g id="edge9" class="edge">
-<title>u3&#45;&gt;u4</title>
-<path fill="none" stroke="black" d="M446.31,-213.67C431.05,-198.41 407.67,-175.03 390.25,-157.6"/>
-<polygon fill="black" stroke="black" points="392.26,-154.66 382.71,-150.07 387.31,-159.61 392.26,-154.66"/>
+<title>u14&#45;&gt;u5</title>
+<path fill="none" stroke="black" d="M656.5,-419.22C649.64,-414.1 642.62,-407.9 637.39,-401 615.71,-372.38 627.41,-355.8 607.39,-326 598.66,-313.01 586.48,-300.68 575.54,-290.91"/>
+<polygon fill="black" stroke="black" points="577.72,-288.16 567.86,-284.28 573.14,-293.46 577.72,-288.16"/>
 </g>
-<!-- u15&#45;&gt;u20 -->
-<g id="edge11" class="edge">
-<title>u15&#45;&gt;u20</title>
-<path fill="none" stroke="black" d="M1113.9,-479.89C1122.62,-470.18 1132.39,-457.13 1137,-443.36 1151.97,-398.69 1160.38,-378.26 1137,-337.36 1108.78,-287.99 1047.61,-259.33 1004.44,-244.54"/>
-<polygon fill="black" stroke="black" points="1005.29,-241.13 994.7,-241.33 1003.1,-247.78 1005.29,-241.13"/>
-</g>
-<!-- u15&#45;&gt;u21 -->
-<g id="edge12" class="edge">
-<title>u15&#45;&gt;u21</title>
-<path fill="none" stroke="black" d="M1064.11,-483.23C1045.49,-474.36 1023.01,-461.04 1008,-443.36 995.41,-428.52 987.56,-407.97 982.91,-391.54"/>
-<polygon fill="black" stroke="black" points="986.19,-390.25 980.3,-381.45 979.41,-392.01 986.19,-390.25"/>
-</g>
-<!-- u15&#45;&gt;u16 -->
+<!-- u14&#45;&gt;u12 -->
 <g id="edge10" class="edge">
-<title>u15&#45;&gt;u16</title>
-<path fill="none" stroke="black" d="M1065.91,-482.84C1056.39,-478.91 1045.84,-474.77 1036,-471.36 993.2,-456.52 978.86,-462.91 938,-443.36 906.22,-428.15 873.73,-404.1 851.98,-386.53"/>
-<polygon fill="black" stroke="black" points="854.15,-383.78 844.2,-380.14 849.71,-389.19 854.15,-383.78"/>
+<title>u14&#45;&gt;u12</title>
+<path fill="none" stroke="black" d="M711.94,-421.27C724.88,-416.59 740.15,-411.77 754.39,-409 784.33,-403.18 865.04,-416.36 891.39,-401 900.07,-395.94 906.74,-387.36 911.63,-378.84"/>
+<polygon fill="black" stroke="black" points="914.82,-380.3 916.24,-369.8 908.58,-377.12 914.82,-380.3"/>
 </g>
-<!-- u22&#45;&gt;u3 -->
-<g id="edge13" class="edge">
-<title>u22&#45;&gt;u3</title>
-<path fill="none" stroke="black" d="M958.36,-481.89C950.55,-477.78 941.65,-473.76 933,-471.36 848.87,-447.93 610.91,-495.7 541,-443.36 481.77,-399.01 466.93,-305.12 463.23,-258.62"/>
-<polygon fill="black" stroke="black" points="466.7,-258.14 462.53,-248.4 459.72,-258.62 466.7,-258.14"/>
+<!-- u18 -->
+<g id="node20" class="node">
+<title>u18</title>
+<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="146.39" cy="-352" rx="73.39" ry="18"/>
+<text text-anchor="middle" x="146.39" y="-348.3" font-family="Times-Roman" font-size="14.00">Requirements</text>
 </g>
-<!-- u24&#45;&gt;u23 -->
-<g id="edge14" class="edge">
-<title>u24&#45;&gt;u23</title>
-<path fill="none" stroke="black" d="M539,-566.16C539,-554.52 539,-538.9 539,-525.59"/>
-<polygon fill="black" stroke="black" points="542.5,-525.53 539,-515.53 535.5,-525.53 542.5,-525.53"/>
+<!-- u18&#45;&gt;u5 -->
+<g id="edge12" class="edge">
+<title>u18&#45;&gt;u5</title>
+<path fill="none" stroke="black" d="M192.35,-337.85C210.3,-333.27 231.16,-328.62 250.39,-326 300.18,-319.2 428.51,-333.26 476.39,-318 493.93,-312.41 511.26,-301.32 524.62,-291.22"/>
+<polygon fill="black" stroke="black" points="527.1,-293.72 532.79,-284.78 522.77,-288.22 527.1,-293.72"/>
 </g>
-<!-- u25&#45;&gt;u23 -->
-<g id="edge15" class="edge">
-<title>u25&#45;&gt;u23</title>
-<path fill="none" stroke="black" d="M605.52,-568.16C593.04,-555.07 574.85,-535.98 560.64,-521.07"/>
-<polygon fill="black" stroke="black" points="563.06,-518.53 553.63,-513.71 557.99,-523.36 563.06,-518.53"/>
+<!-- u18&#45;&gt;u13 -->
+<g id="edge11" class="edge">
+<title>u18&#45;&gt;u13</title>
+<path fill="none" stroke="black" d="M146.39,-333.82C146.39,-323.19 146.39,-309.31 146.39,-297.2"/>
+<polygon fill="black" stroke="black" points="149.89,-297.15 146.39,-287.15 142.89,-297.15 149.89,-297.15"/>
 </g>
-<!-- u26&#45;&gt;u23 -->
-<g id="edge16" class="edge">
-<title>u26&#45;&gt;u23</title>
-<path fill="none" stroke="black" d="M404.45,-572.49C410.21,-570.35 416.28,-568.2 422,-566.36 454.84,-555.8 467.7,-564.57 497,-546.36 506.69,-540.33 515.39,-531.38 522.32,-522.83"/>
-<polygon fill="black" stroke="black" points="525.11,-524.94 528.4,-514.87 519.55,-520.69 525.11,-524.94"/>
+<!-- u20 -->
+<g id="node21" class="node">
+<title>u20</title>
+<ellipse fill="#bbffbb" stroke="black" stroke-width="0" cx="840.39" cy="-688" rx="32.49" ry="18"/>
+<text text-anchor="middle" x="840.39" y="-684.3" font-family="Times-Roman" font-size="14.00">Main</text>
 </g>
-<!-- u27&#45;&gt;u23 -->
-<g id="edge17" class="edge">
-<title>u27&#45;&gt;u23</title>
-<path fill="none" stroke="black" d="M474.99,-568.81C481.81,-562.08 489.92,-553.92 497,-546.36 504.22,-538.64 511.9,-530 518.69,-522.2"/>
-<polygon fill="black" stroke="black" points="521.75,-524.01 525.64,-514.16 516.45,-519.43 521.75,-524.01"/>
+<!-- u21 -->
+<g id="node22" class="node">
+<title>u21</title>
+<ellipse fill="#bbffbb" stroke="black" stroke-width="0" cx="840.39" cy="-616" rx="46.29" ry="18"/>
+<text text-anchor="middle" x="840.39" y="-612.3" font-family="Times-Roman" font-size="14.00">Validate</text>
 </g>
-<!-- u29 -->
-<g id="node32" class="node">
-<title>u29</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="1078" cy="-363.36" rx="50.09" ry="18"/>
-<text text-anchor="middle" x="1078" y="-359.66" font-family="Times,serif" font-size="14.00">Prompts</text>
-</g>
-<!-- u29&#45;&gt;u18 -->
-<g id="edge18" class="edge">
-<title>u29&#45;&gt;u18</title>
-<path fill="none" stroke="black" d="M1048.59,-348.6C1038.46,-344.37 1026.91,-340.11 1016,-337.36 911.5,-310.96 867.84,-365.11 775,-310.36 754.6,-298.32 739.69,-275.6 730.41,-257.61"/>
-<polygon fill="black" stroke="black" points="733.35,-255.66 725.83,-248.19 727.05,-258.72 733.35,-255.66"/>
-</g>
-<!-- u30 -->
-<g id="node33" class="node">
-<title>u30</title>
-<ellipse fill="#ffffbb" stroke="black" stroke-width="0" cx="1015" cy="-584.36" rx="76.09" ry="18"/>
-<text text-anchor="middle" x="1015" y="-580.66" font-family="Times,serif" font-size="14.00">Requirements</text>
-</g>
-<!-- u30&#45;&gt;u22 -->
-<g id="edge19" class="edge">
-<title>u30&#45;&gt;u22</title>
-<path fill="none" stroke="black" d="M1008.32,-566.16C1003.73,-554.33 997.54,-538.39 992.32,-524.93"/>
-<polygon fill="black" stroke="black" points="995.44,-523.3 988.56,-515.24 988.91,-525.83 995.44,-523.3"/>
-</g>
-<!-- u33 -->
-<g id="node34" class="node">
-<title>u33</title>
-<ellipse fill="#bbffbb" stroke="black" stroke-width="0" cx="1198" cy="-672.36" rx="34.39" ry="18"/>
-<text text-anchor="middle" x="1198" y="-668.66" font-family="Times,serif" font-size="14.00">Main</text>
-</g>
-<!-- u33&#45;&gt;u24 -->
+<!-- u20&#45;&gt;u21 -->
 <g id="edge1" class="edge">
-<title>u33&#45;&gt;u24</title>
-<path fill="none" stroke="black" d="M1174.36,-659.12C1169.71,-657.19 1164.79,-655.47 1160,-654.36 1097.19,-639.75 638.07,-661.41 580,-633.36 569.53,-628.3 560.7,-619.19 553.94,-610.25"/>
-<polygon fill="black" stroke="black" points="556.7,-608.09 548.12,-601.88 550.95,-612.09 556.7,-608.09"/>
+<title>u20&#45;&gt;u21</title>
+<path fill="none" stroke="black" d="M840.39,-669.7C840.39,-661.98 840.39,-652.71 840.39,-644.11"/>
+<polygon fill="black" stroke="black" points="843.89,-644.1 840.39,-634.1 836.89,-644.1 843.89,-644.1"/>
 </g>
-<!-- u33&#45;&gt;u25 -->
+<!-- u21&#45;&gt;u0 -->
 <g id="edge2" class="edge">
-<title>u33&#45;&gt;u25</title>
-<path fill="none" stroke="black" d="M1174.36,-659.14C1169.71,-657.21 1164.78,-655.48 1160,-654.36 1105.55,-641.54 706.67,-659.08 657,-633.36 647.19,-628.28 639.2,-619.29 633.19,-610.45"/>
-<polygon fill="black" stroke="black" points="636.09,-608.48 627.85,-601.82 630.14,-612.16 636.09,-608.48"/>
+<title>u21&#45;&gt;u0</title>
+<path fill="none" stroke="black" d="M840.39,-597.7C840.39,-589.25 840.39,-578.87 840.39,-569.37"/>
+<polygon fill="black" stroke="black" points="843.89,-569.18 840.39,-559.18 836.89,-569.18 843.89,-569.18"/>
 </g>
 </g>
 </svg>