Integrate stack better

2021-08-09 15:25:22 +02:00
45 changed files with 961 additions and 25517 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -99,7 +99,7 @@ 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:
@@ -207,7 +207,7 @@ variables:
  only:
    - tags
  variables:
-    JSON_VERSION: "0.0.7"
+    JSON_VERSION: "0.0.6"
 ######## stack test ########
@@ -230,7 +230,7 @@ test:linux:bootstrap_script:
  script:
    - ./.gitlab/script/ghcup_bootstrap.sh
  variables:
-    GHC_VERSION: "8.10.6"
+    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
  extends:
    - .debian
@@ -247,7 +247,7 @@ test:windows:bootstrap_powershell_script:
    - "[Environment]::SetEnvironmentVariable('CABAL_DIR', $null, [System.EnvironmentVariableTarget]::User)"
    - bash ./.gitlab/after_script.sh
  variables:
-    GHC_VERSION: "8.10.6"
+    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
  extends:
    - .windows
@@ -255,11 +255,19 @@ test:windows:bootstrap_powershell_script:
 ######## linux test ########
-test:linux:
+test:linux:recommended:
  stage: test
  extends: .test_ghcup_version:linux
  variables:
-    GHC_VERSION: "8.10.6"
+    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
  needs: []
 test:linux:latest:
  stage: test
  extends: .test_ghcup_version:linux
  variables:
    GHC_VERSION: "9.0.1"
    CABAL_VERSION: "3.4.0.0"
  needs: []
@@ -269,8 +277,8 @@ test:linux:cross-armv7:
    - .test_ghcup_version
    - .debian
  variables:
-    GHC_VERSION: "8.10.5"
+    GHC_VERSION: "8.10.4"
-    GHC_TARGET_VERSION: "8.10.6"
+    GHC_TARGET_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
    CROSS: "arm-linux-gnueabihf"
  needs: []
@@ -287,7 +295,7 @@ test:linux:git:hadrian:
    - .test_ghcup_version
    - .debian
  variables:
-    GHC_VERSION: "8.10.6"
+    GHC_VERSION: "8.10.5"
    GHC_GIT_TAG: "ghc-9.0.1-release"
    GHC_GIT_VERSION: "9.0.1"
    CABAL_VERSION: "3.4.0.0"
@@ -303,17 +311,17 @@ test:linux:git:hadrian:
 ######## linux 32bit test ########
-test:linux:32bit:
+test:linux:recommended:32bit:
  stage: test
  extends: .test_ghcup_version:linux32
  variables:
-    GHC_VERSION: "8.10.6"
+    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.2.0.0"
  needs: []
 ######## arm tests ########
-test:linux:armv7:
+test:linux:recommended:armv7:
  stage: test
  extends: .test_ghcup_version:armv7
  variables:
@@ -323,7 +331,7 @@ test:linux:armv7:
  when: manual
  needs: []
-test:linux:aarch64:
+test:linux:recommended:aarch64:
  stage: test
  extends: .test_ghcup_version:aarch64
  variables:
@@ -335,7 +343,7 @@ test:linux:aarch64:
 ######## darwin test ########
-test:mac:
+test:mac:recommended:
  stage: test
  extends: .test_ghcup_version:darwin
  variables:
@@ -343,11 +351,19 @@ test:mac:
    CABAL_VERSION: "3.4.0.0"
  needs: []
-test:mac:aarch64:
+test:mac:latest:
  stage: test
  extends: .test_ghcup_version:darwin
  variables:
    GHC_VERSION: "9.0.1"
    CABAL_VERSION: "3.4.0.0"
  needs: []
 test:mac:recommended:aarch64:
  stage: test
  extends: .test_ghcup_version:darwin:aarch64
  variables:
-    GHC_VERSION: "8.10.6"
+    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
  needs: []
  allow_failure: true
@@ -355,7 +371,7 @@ test:mac:aarch64:
 ######## freebsd test ########
-test:freebsd:
+test:freebsd:recommended:
  stage: test
  extends: .test_ghcup_version:freebsd
  variables:
@@ -367,11 +383,11 @@ test:freebsd:
 ######## windows test ########
-test:windows:
+test:windows:recommended:
  stage: test
  extends: .test_ghcup_version:windows
  variables:
-    GHC_VERSION: "8.10.6"
+    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
  needs: []
@@ -384,7 +400,7 @@ test:windows:
 release:linux:64bit:
  stage: release
-  needs: ["test:linux"]
+  needs: ["test:linux:recommended", "test:linux:latest"]
  extends:
    - .alpine:64bit
    - .release_ghcup
@@ -392,13 +408,13 @@ release:linux:64bit:
    - ./.gitlab/before_script/linux/alpine/install_deps.sh
  variables:
    ARTIFACT: "x86_64-linux-ghcup"
-    GHC_VERSION: "8.10.6"
+    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
 release:linux:32bit:
  stage: release
-  needs: ["test:linux:32bit"]
+  needs: ["test:linux:recommended:32bit"]
  extends:
    - .alpine:32bit
    - .release_ghcup
@@ -406,12 +422,12 @@ release:linux:32bit:
    - ./.gitlab/before_script/linux/alpine/install_deps.sh
  variables:
    ARTIFACT: "i386-linux-ghcup"
-    GHC_VERSION: "8.10.6"
+    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.2.0.0"
 release:linux:armv7:
  stage: release
-  needs: ["test:linux:armv7"]
+  needs: ["test:linux:recommended:armv7"]
  extends:
    - .linux:armv7
    - .release_ghcup
@@ -425,7 +441,7 @@ release:linux:armv7:
 release:linux:aarch64:
  stage: release
-  needs: ["test:linux:aarch64"]
+  needs: ["test:linux:recommended:aarch64"]
  extends:
    - .linux:aarch64
    - .release_ghcup
@@ -441,7 +457,7 @@ release:linux:aarch64:
 release:darwin:
  stage: release
-  needs: ["test:mac"]
+  needs: ["test:mac:recommended", "test:mac:latest"]
  extends:
    - .darwin
    - .release_ghcup
@@ -450,13 +466,13 @@ release:darwin:
    - ./.gitlab/before_script/darwin/install_deps.sh
  variables:
    ARTIFACT: "x86_64-apple-darwin-ghcup"
-    GHC_VERSION: "8.10.6"
+    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
    MACOSX_DEPLOYMENT_TARGET: "10.7"
 release:darwin:aarch64:
  stage: release
-  needs: ["test:mac:aarch64"]
+  needs: ["test:mac:recommended:aarch64"]
  extends:
    - .darwin:aarch64
    - .release_ghcup
@@ -483,7 +499,7 @@ release:darwin:aarch64:
    runInNixShell ./.gitlab/script/ghcup_release.sh 2>&1
  variables:
    ARTIFACT: "aarch64-apple-darwin-ghcup"
-    GHC_VERSION: "8.10.6"
+    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
    MACOSX_DEPLOYMENT_TARGET: "10.7"
  allow_failure: true
@@ -493,7 +509,7 @@ release:darwin:aarch64:
 release:freebsd:
  stage: release
-  needs: ["test:freebsd"]
+  needs: ["test:freebsd:recommended"]
  extends:
    - .freebsd
    - .release_ghcup
@@ -502,7 +518,7 @@ release:freebsd:
    - ./.gitlab/before_script/freebsd/install_deps.sh
  variables:
    ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-    GHC_VERSION: "8.10.6"
+    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
  allow_failure: true
@@ -510,7 +526,7 @@ release:freebsd:
 release:windows:
  stage: release
-  needs: ["test:windows"]
+  needs: ["test:windows:recommended"]
  extends:
    - .windows
    - .release_ghcup
@@ -519,7 +535,7 @@ release:windows:
    - bash ./.gitlab/before_script/windows/install_deps.sh
  variables:
    ARTIFACT: "x86_64-mingw64-ghcup"
-    GHC_VERSION: "8.10.6"
+    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
 ######## hlint ########
@@ -533,7 +549,7 @@ hlint:
  script:
    - ./.gitlab/script/hlint.sh
  variables:
-    GHC_VERSION: "8.10.6"
+    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
    JSON_VERSION: "0.0.4"
  allow_failure: true
--- a/.gitlab/before_script/darwin/install_deps.sh
+++ b/.gitlab/before_script/darwin/install_deps.sh
@@ -7,7 +7,7 @@ set -eux
 mkdir -p "${TMPDIR}"
 if [ $ARCH = 'ARM64' ] ; then
-	curl -sSfL https://downloads.haskell.org/~ghcup/aarch64-apple-darwin-ghcup > ./ghcup-bin
+	curl -sSfL https://downloads.haskell.org/~ghcup/0.1.15.1/aarch64-apple-darwin-ghcup-0.1.15.1 > ./ghcup-bin
 	chmod +x ghcup-bin
 else
 	curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-apple-darwin-ghcup > ./ghcup-bin
--- a/.gitlab/before_script/linux/alpine/install_deps.sh
+++ b/.gitlab/before_script/linux/alpine/install_deps.sh
@@ -52,7 +52,3 @@ apk add --no-cache \
 	xz-dev \
 	ncurses-static
 if [ "${ARCH}" = "32" ] ; then
 	apk add --no-cache \
 		bsd-compat-headers
 fi
--- a/.gitlab/before_script/windows/install_deps.sh
+++ b/.gitlab/before_script/windows/install_deps.sh
@@ -9,7 +9,7 @@ mkdir -p "${TMPDIR}" "${CABAL_DIR}"
 mkdir -p "$GHCUP_INSTALL_BASE_PREFIX/ghcup/bin"
 CI_PROJECT_DIR=$(pwd)
-curl -o ghcup.exe https://downloads.haskell.org/~ghcup/x86_64-mingw64-ghcup.exe
+curl -o ghcup.exe https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-mingw64-ghcup-0.1.15.1.exe
 chmod +x ghcup.exe
 ./ghcup.exe install ${GHC_VERSION}
--- a/.gitlab/ghc-8.10.3-linux.files
+++ b/.gitlab/ghc-8.10.3-linux.files
--- a/.gitlab/ghc-8.10.3-windows.files
+++ b/.gitlab/ghc-8.10.3-windows.files
--- a/.gitlab/script/ghcup_release.sh
+++ b/.gitlab/script/ghcup_release.sh
@@ -18,7 +18,7 @@ ecabal update
 if [ "${OS}" = "LINUX" ] ; then
 	if [ "${ARCH}" = "32" ] ; then
-		ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static' -ftui
+		ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static' -ftui -ftar
 	elif [ "${ARCH}" = "64" ] ; then
 		ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static' -ftui
 	else
--- a/.gitlab/script/ghcup_version.sh
+++ b/.gitlab/script/ghcup_version.sh
@@ -42,25 +42,13 @@ if [ "${OS}" = "DARWIN" ] ; then
 	ecabal haddock -w ghc-${GHC_VERSION} -ftui
 elif [ "${OS}" = "LINUX" ] ; then
 	if [ "${ARCH}" = "32" ] ; then
-		ecabal build -w ghc-${GHC_VERSION} -finternal-downloader -ftui
+		ecabal build -w ghc-${GHC_VERSION} -finternal-downloader -ftui -ftar
-		ecabal test -w ghc-${GHC_VERSION} -finternal-downloader -ftui ghcup-test
+		ecabal test -w ghc-${GHC_VERSION} -finternal-downloader -ftui -ftar ghcup-test
-		ecabal haddock -w ghc-${GHC_VERSION} -finternal-downloader -ftui
+		ecabal haddock -w ghc-${GHC_VERSION} -finternal-downloader -ftui -ftar
 	else
 		ecabal build -w ghc-${GHC_VERSION} -finternal-downloader -ftui
 		ecabal test -w ghc-${GHC_VERSION} -finternal-downloader -ftui ghcup-test
 		ecabal haddock -w ghc-${GHC_VERSION} -finternal-downloader -ftui
 		if [ "${ARCH}" = "64" ] ; then
 			# doctest
 			curl -sL https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-docspec/cabal-docspec-0.0.0.20210228_p1.tar.bz2 > cabal-docspec.tar.bz2
 			echo '3a10f6fec16dbd18efdd331b1cef5d2d342082da42f5b520726d1fa6a3990d12  cabal-docspec.tar.bz2' | sha256sum -c -
 			tar -xjf cabal-docspec.tar.bz2 cabal-docspec
 			mv cabal-docspec "$CI_PROJECT_DIR"/.local/bin/cabal-docspec
 			rm -f cabal-docspec.tar.bz2
 			chmod a+x "$CI_PROJECT_DIR"/.local/bin/cabal-docspec
 			cabal-docspec -XCPP -XTypeSynonymInstances -XOverloadedStrings -XPackageImports --check-properties
 		fi
 	fi
 elif [ "${OS}" = "FREEBSD" ] ; then
 	ecabal build -w ghc-${GHC_VERSION} -finternal-downloader -ftui --constraint="zip +disable-zstd"
@@ -128,20 +116,7 @@ else
 	if [ "${OS}" = "LINUX" ] ; then
 		eghcup --downloader=wget prefetch ghc 8.10.3
 		eghcup --offline install ghc 8.10.3
-		if [ "${ARCH}" = "64" ] ; then
+	else # test wget a bit
 			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}" = "${expected}" ]
 			unset actual expected
 		fi
 	elif [ "${OS}" = "WINDOWS" ] ; then
 		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}" = "${expected}" ]
 		unset actual expected
 	else
 		eghcup prefetch ghc 8.10.3
 		eghcup --offline install ghc 8.10.3
 	fi
@@ -221,21 +196,6 @@ sha3=$(sha_sum "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml")
 [ "${etag2}" = "${etag3}" ]
 [ "${sha2}" = "${sha3}" ]
 # test isolated installs
 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" ]
 	fi
 fi
 eghcup upgrade
 eghcup upgrade -f
--- a/.gitlab/shell.nix
+++ b/.gitlab/shell.nix
@@ -43,7 +43,6 @@
  # 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"
  '';
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,5 @@
 # Revision history for ghcup
 ## 0.1.16.2 -- 2021-08-12
 * Add isolated installations wrt [#141](https://gitlab.haskell.org/haskell/ghcup-hs/-/merge_requests/141) by Arjun Kathuria
 * Implement config cli MVP wrt [#134](https://gitlab.haskell.org/haskell/ghcup-hs/-/merge_requests/134) by Oleksii Dorozhkin
 * Fix `ghcup compile ghc --flavor`
 * Fix minor installation bug causing increased disk space wrt [#139](https://gitlab.haskell.org/haskell/ghcup-hs/-/merge_requests/139)
 * Improved error handling wrt [#136](https://gitlab.haskell.org/haskell/ghcup-hs/-/merge_requests/136)
 * Various improvements to metadata download when using `file://` and `--offline` wrt [#137](https://gitlab.haskell.org/haskell/ghcup-hs/-/merge_requests/137)
 ## 0.1.16.1 -- 2021-07-29
 * Add 'nuke' subcommand wrt [#135](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/135), implemented by Arjun Kathuria
--- a/README.md
+++ b/README.md
@@ -6,11 +6,6 @@ Similar in scope to [rustup](https://github.com/rust-lang-nursery/rustup.rs), [p
 ## Table of Contents
 [![Join the chat at Libera.chat](https://img.shields.io/badge/chat-on%20libera%20IRC-brightgreen.svg)](https://kiwiirc.com/nextclient/irc.libera.chat/?nick=Guest%7C?#haskell,#haskell-ghcup)
 [![Join the chat at Matrix.org](https://img.shields.io/matrix/haskell-tooling:matrix.org?label=chat%20on%20matrix.org)](https://app.element.io/#/room/#haskell-tooling:matrix.org)
 [![Join the chat at Discord](https://img.shields.io/discord/280033776820813825?label=chat%20on%20discord)](https://discord.gg/pKYf3zDQU7)
 [![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)
   * [Installation](#installation)
     * [Simple bootstrap](#simple-bootstrap)
     * [Manual install](#manual-install)
@@ -23,8 +18,9 @@ Similar in scope to [rustup](https://github.com/rust-lang-nursery/rustup.rs), [p
     * [XDG support](#xdg-support)
     * [Env variables](#env-variables)
     * [Installing custom bindists](#installing-custom-bindists)
     * [Isolated Installs](#isolated-installs)
     * [Tips and tricks](#tips-and-tricks)
     * [Stack hooks](#stack-hooks)
     * [Sharing MSys2 between stack and ghcup](#sharing-msys2-between-stack-and-ghcup)
   * [Design goals](#design-goals)
   * [How](#how)
   * [Known users](#known-users)
@@ -145,6 +141,10 @@ This is the complete list of env variables that change GHCup behavior:
 * `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 are additional variables:
 * `GHCUP_MSYS2`: where to find msys2, so we can invoke shells and other cool stuff
 ### Installing custom bindists
 There are a couple of good use cases to install custom bindists:
@@ -161,36 +161,6 @@ 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).
 ### Isolated installs
 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.
 - No symlinks are made to these isolated installed tools, you'd have to manually point to them wherever you intend to use them.
 - These installs, can also NOT be deleted from ghcup, you'd have to go and manually delete these.
 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/  
   - `ghcup install ghc 8.10.5 --isolate /home/user/isolated_dir/ghc`
 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/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  
   - `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` 
   ---  
 ### Tips and tricks
 #### with_ghc wrapper (e.g. for HLS)
@@ -238,6 +208,36 @@ 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.
 ### Stack hooks
 GHCup distributes a patched Stack, which has support for custom installation hooks, see:
 * https://github.com/commercialhaskell/stack/pull/5585
 Usually, the bootstrap script will already install a hook for you. If not,
 download it [here](https://gitlab.haskell.org/haskell/ghcup-hs/-/tree/master/hooks/stack/ghc-install.sh),
 place it in `~/.stack/hooks/ghc-install.sh` and make sure it's executable.
 Hooks aren't run when `system-ghc: true` is set in `stack.yaml`. If you want stack
 to never fall back to its own installation logic if ghcup fails, run the following command:
 ```sh
 stack config set install-ghc false --global
 ```
 ### Sharing MSys2 between stack and ghcup
 You can tell stack to use GHCup's MSys2 installation. Add the following lines to `~/.stack/config.yaml`:
 ```yml
 skip-msys: true
 extra-path:
  - "C:\\ghcup\\msys64\\usr\\bin"
  - "C:\\ghcup\\msys64\\mingw64\\bin"
 extra-include-dirs: "C:\\ghcup\\msys64\\mingw64\\include"
 extra-lib-dirs: "C:\\ghcup\\msys64\\mingw64\\lib"
 ```
 ## Design goals
 1. simplicity
@@ -314,18 +314,6 @@ to figure out whether you have the correct toolchain and
 the correct dependencies. Refer to [the official docs](https://ghc.haskell.org/trac/ghc/wiki/Building/Preparation/Linux)
 on how to prepare your environment for building GHC.
 ### Stack support
 There may be a number of bugs when trying to make ghcup installed GHC versions work with stack,
 such as:
 - https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/188
 Further, stack's upgrade procedure may break/confuse ghcup. There are a number of integration
 issues discussed here:
 - https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/153
 ### Windows support
 Windows support is in early stages. Since windows doesn't support symbolic links properly,
--- a/app/ghcup-gen/Validate.hs
+++ b/app/ghcup-gen/Validate.hs
@@ -5,7 +5,6 @@
 {-# LANGUAGE TemplateHaskell  #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE ViewPatterns     #-}
 {-# LANGUAGE OverloadedStrings #-}
 module Validate where
@@ -19,7 +18,11 @@ import           GHCup.Utils
 import           GHCup.Utils.Logger
 import           GHCup.Utils.Version.QQ
 #if defined(TAR)
 import qualified Codec.Archive.Tar             as Tar
 #else
 import           Codec.Archive
 #endif
 import           Control.Applicative
 import           Control.Exception.Safe
 import           Control.Monad
@@ -34,6 +37,7 @@ import           Control.Monad.Trans.Resource   ( runResourceT
 import           Data.Containers.ListUtils      ( nubOrd )
 import           Data.IORef
 import           Data.List
 import           Data.String.Interpolate
 import           Data.Versions
 import           Haskus.Utils.Variant.Excepts
 import           Optics
@@ -89,23 +93,24 @@ validate dls _ = do
    if e > 0
      then pure $ ExitFailure e
      else do
-        lift $ $(logInfo) "All good"
+        lift $ $(logInfo) [i|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) $
+      lift $ $(logError)
-        "Linux UnknownLinux missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
+        [i|Linux UnknownLinux missing for for #{t} #{v'} #{arch'}|]
      addError
    when ((notElem Darwin pspecs) && arch == A_64) $ do
-      lift $ $(logError) $ "Darwin missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
+      lift $ $(logError) [i|Darwin missing for #{t} #{v'} #{arch'}|]
      addError
-    when ((notElem FreeBSD pspecs) && arch == A_64) $ lift $ $(logWarn) $
+    when ((notElem FreeBSD pspecs) && arch == A_64) $ lift $ $(logWarn)
-      "FreeBSD missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
+      [i|FreeBSD missing for #{t} #{v'} #{arch'}|]
    when (notElem Windows pspecs && arch == A_64) $ do
-      lift $ $(logError) $ "Windows missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
+      lift $ $(logError)
        [i|Windows missing for for #{t} #{v'} #{arch'}|]
      addError
    -- alpine needs to be set explicitly, because
@@ -113,12 +118,12 @@ validate dls _ = do
    -- (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
+        GHCup | arch `elem` [A_64, A_32] -> lift ($(logError) [i|Linux Alpine missing for #{t} #{v'} #{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
+              , arch `elem` [A_64, A_32] -> lift ($(logError) [i|Linux Alpine missing for #{t} #{v'} #{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))
+            , arch `elem` [A_64, A_32] -> lift ($(logError) [i|Linux Alpine missing for #{t} #{v'} #{arch'}|])
-        _ -> lift $ $(logWarn) $ "Linux Alpine missing for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack (prettyShow arch)
+        _ -> lift $ $(logWarn) [i|Linux Alpine missing for #{t} #{v'} #{arch'}|]
  checkUniqueTags tool = do
    let allTags = join $ fmap _viTags $ M.elems $ availableToolVersions dls tool
@@ -138,7 +143,7 @@ validate dls _ = do
    case join nonUnique of
      [] -> pure ()
      xs -> do
-        lift $ $(logError) $ "Tags not unique for " <> T.pack (prettyShow tool) <> ": " <> T.pack (prettyShow xs)
+        lift $ $(logError) [i|Tags not unique for #{tool}: #{xs}|]
        addError
   where
    isUniqueTag Latest         = True
@@ -154,7 +159,7 @@ validate dls _ = do
      case [ x | (x,"") <- readP_to_S V.parseVersion (T.unpack . prettyVer $ v) ] of
        [_] -> pure ()
        _   -> do
-          lift $ $(logError) $ "GHC version " <> prettyVer v <> " is not valid"
+          lift $ $(logError) [i|GHC version #{v} is not valid |]
          addError
  -- a tool must have at least one of each mandatory tags
@@ -162,7 +167,7 @@ validate dls _ = 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)
+        lift $ $(logError) [i|Tag #{t} missing from #{tool}|]
        addError
      True -> pure ()
@@ -171,7 +176,7 @@ validate dls _ = 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
+        lift $ $(logError) [i|Base tag missing from GHC ver #{ver}|]
        addError
      True -> pure ()
@@ -204,7 +209,7 @@ validateTarballs (TarballFilter etool versionRegex) dls gt = do
    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" *> addError
+    when (null allDls) $ $(logError) [i|no tarballs selected by filter|] *> addError
    forM_ allDls downloadAll
    -- exit
@@ -212,7 +217,7 @@ validateTarballs (TarballFilter etool versionRegex) dls gt = do
    if e > 0
      then pure $ ExitFailure e
      else do
-        lift $ $(logInfo) "All good"
+        lift $ $(logInfo) [i|All good|]
        pure ExitSuccess
 where
@@ -232,7 +237,7 @@ validateTarballs (TarballFilter etool versionRegex) dls gt = do
                  ($(logError) $ T.pack $ prettyShow e)
                liftIO $ exitWith (ExitFailure 2)
-    let appstate = AppState (Settings True False Never Curl True GHCupURL False) dirs defaultKeyBindings (GHCupInfo mempty mempty mempty) pfreq
+    let appstate = AppState (Settings True False Never Curl False GHCupURL False) dirs defaultKeyBindings (GHCupInfo mempty mempty mempty) pfreq
    r <-
      runLogger
@@ -241,7 +246,11 @@ validateTarballs (TarballFilter etool versionRegex) dls gt = do
      . runE @'[DigestError
               , DownloadFailed
               , UnknownArchive
 #if defined(TAR)
               , Tar.FormatError
 #else
               , ArchiveResult
 #endif
               ]
      $ do
        case etool of
@@ -264,25 +273,25 @@ validateTarballs (TarballFilter etool versionRegex) dls gt = do
        case _dlSubdir dli of
          Just (RealDir prel) -> do
            lift $ $(logInfo)
-              $ " verifying subdir: " <> T.pack prel
+              [i|verifying subdir: #{prel}|]
            when (basePath /= prel) $ do
-              lift $ $(logError) $
+              lift $ $(logError)
-                "Subdir doesn't match: expected " <> T.pack prel <> ", got " <> T.pack basePath
+                [i|Subdir doesn't match: expected "#{prel}", got "#{basePath}"|]
              addError
          Just (RegexDir regexString) -> do
-            lift $ $(logInfo) $
+            lift $ $(logInfo)
-              "verifying subdir (regex): " <> T.pack regexString
+              [i|verifying subdir (regex): #{regexString}|]
            let regex = makeRegexOpts
                  compIgnoreCase
                  execBlank
                  regexString
            when (not (match regex basePath)) $ do
-              lift $ $(logError) $
+              lift $ $(logError)
-                "Subdir doesn't match: expected regex " <> T.pack regexString <> ", got " <> T.pack basePath
+                [i|Subdir doesn't match: expected regex "#{regexString}", got "#{basePath}"|]
              addError
          Nothing -> pure ()
      VRight Nothing -> pure ()
      VLeft  e -> do
-        lift $ $(logError) $
+        lift $ $(logError)
-          "Could not download (or verify hash) of " <> T.pack (show dli) <> ", Error was: " <> T.pack (prettyShow e)
+          [i|Could not download (or verify hash) of #{dli}, Error was: #{prettyShow e}|]
        addError
--- a/app/ghcup/BrickMain.hs
+++ b/app/ghcup/BrickMain.hs
@@ -27,7 +27,9 @@ import           Brick.Widgets.List             ( listSelectedFocusedAttr
                                                , listSelectedAttr
                                                , listAttr
                                                )
 #if !defined(TAR)
 import           Codec.Archive
 #endif
 import           Control.Exception.Safe
 import           Control.Monad.Logger
 import           Control.Monad.Reader
@@ -38,6 +40,7 @@ import           Data.Functor
 import           Data.List
 import           Data.Maybe
 import           Data.IORef
 import           Data.String.Interpolate
 import           Data.Vector                    ( Vector
                                                , (!?)
                                                )
@@ -425,7 +428,9 @@ install' _ (_, ListResult {..}) = do
          . runResourceT
          . runE
            @'[ AlreadyInstalled
 #if !defined(TAR)
              , ArchiveResult
 #endif
              , UnknownArchive
              , FileDoesNotExistError
              , CopyError
@@ -435,29 +440,27 @@ install' _ (_, ListResult {..}) = do
              , TagNotFound
              , DigestError
              , DownloadFailed
              , DirNotEmpty
              , NoUpdate
              , TarDirDoesNotExist
              , FileAlreadyExistsError
              ]
  run (do
      case lTool of
        GHC   -> do
          let vi = getVersionInfo lVer GHC dls
-          liftE $ installGHCBin lVer Nothing $> vi
+          liftE $ installGHCBin lVer $> vi
        Cabal -> do
          let vi = getVersionInfo lVer Cabal dls
-          liftE $ installCabalBin lVer Nothing $> vi
+          liftE $ installCabalBin lVer $> vi
        GHCup -> do
          let vi = snd <$> getLatest dls GHCup
          liftE $ upgradeGHCup Nothing False $> vi
        HLS   -> do
          let vi = getVersionInfo lVer HLS dls
-          liftE $ installHLSBin lVer Nothing $> vi
+          liftE $ installHLSBin lVer $> vi
        Stack -> do
          let vi = getVersionInfo lVer Stack dls
-          liftE $ installStackBin lVer Nothing $> vi
+          liftE $ installStackBin lVer $> vi
    )
    >>= \case
          VRight vi                         -> do
@@ -466,8 +469,8 @@ install' _ (_, ListResult {..}) = do
            pure $ Right ()
          VLeft  (V (AlreadyInstalled _ _)) -> pure $ Right ()
          VLeft (V NoUpdate) -> pure $ Right ()
-          VLeft e -> pure $ Left $ prettyShow e <> "\n"
+          VLeft e -> pure $ Left [i|#{prettyShow e}
-            <> "Also check the logs in ~/.ghcup/logs"
+Also check the logs in ~/.ghcup/logs|]
 set' :: BrickState -> (Int, ListResult) -> IO (Either String ())
@@ -529,8 +532,8 @@ changelog' :: (MonadReader AppState m, MonadIO m)
 changelog' _ (_, ListResult {..}) = do
  AppState { pfreq, ghcupInfo = GHCupInfo { _ghcupDownloads = dls }} <- ask
  case getChangeLog dls lTool (Left lVer) of
-    Nothing -> pure $ Left $
+    Nothing -> pure $ Left
-      "Could not find ChangeLog for " <> prettyShow lTool <> ", version " <> T.unpack (prettyVer lVer)
+      [i|Could not find ChangeLog for #{lTool}, version #{prettyVer lVer}|]
    Just uri -> do
      let cmd = case _rPlatform pfreq of
            Darwin  -> "open"
@@ -596,7 +599,7 @@ brickMain s l = do
          )
        $> ()
    Left e -> do
-      runLogger ($(logError) $ "Error building app state: " <> T.pack (show e))
+      runLogger ($(logError) [i|Error building app state: #{show e}|])
      exitWith $ ExitFailure 2
--- a/app/ghcup/Main.hs
+++ b/app/ghcup/Main.hs
@@ -30,7 +30,9 @@ import           GHCup.Utils.Prelude
 import           GHCup.Utils.String.QQ
 import           GHCup.Version
 #if !defined(TAR)
 import           Codec.Archive
 #endif
 import           Control.Concurrent
 import           Control.Concurrent.Async
 import           Control.DeepSeq                ( force )
@@ -49,6 +51,7 @@ import           Data.Functor
 import           Data.List                      ( intercalate, nub, sort, sortBy )
 import           Data.List.NonEmpty             (NonEmpty ((:|)))
 import           Data.Maybe
 import           Data.String.Interpolate
 import           Data.Text                      ( Text )
 import           Data.Versions           hiding ( str )
 import           Data.Void
@@ -75,8 +78,6 @@ import qualified Data.Map.Strict               as M
 import qualified Data.Text                     as T
 import qualified Data.Text.IO                  as T
 import qualified Data.Text.Encoding            as E
 import qualified Data.Yaml                     as Y
 import qualified Data.Yaml.Pretty              as YP
 import qualified Text.Megaparsec               as MP
 import qualified Text.Megaparsec.Char          as MPC
@@ -104,7 +105,6 @@ data Command
  | Rm (Either RmCommand RmOptions)
  | DInfo
  | Compile CompileCommand
  | Config ConfigCommand
  | Whereis WhereisOptions WhereisCommand
  | Upgrade UpgradeOpts Bool
  | ToolRequirements
@@ -138,7 +138,6 @@ data InstallOptions = InstallOptions
  , instPlatform :: Maybe PlatformRequest
  , instBindist  :: Maybe URI
  , instSet      :: Bool
  , isolateDir   :: Maybe FilePath
  }
 data SetCommand = SetGHC SetOptions
@@ -174,8 +173,6 @@ data RmOptions = RmOptions
 data CompileCommand = CompileGHC GHCCompileOptions
 data ConfigCommand = ShowConfig | SetConfig String String | InitConfig
 data GHCCompileOptions = GHCCompileOptions
  { targetGhc    :: Either Version GitBranch
  , bootstrapGhc :: Either Version FilePath
@@ -188,7 +185,6 @@ data GHCCompileOptions = GHCCompileOptions
  , ovewrwiteVer :: Maybe Version
  , buildFlavour :: Maybe String
  , hadrian      :: Bool
  , isolateDir   :: Maybe FilePath
  }
 data UpgradeOpts = UpgradeInplace
@@ -412,12 +408,6 @@ com =
                  <> footerDoc (Just $ text changeLogFooter)
                  )
               )
          <> command
               "config"
               (   Config
               <$> info (configP <**> helper)
                        (progDesc "Show or set config" <> footerDoc (Just $ text configFooter))
               )
          <> commandGroup "Other commands:"
          <> hidden
          )
@@ -492,17 +482,6 @@ Examples:
  ghcup prefetch ghc 8.10.5
  ghcup --offline install ghc 8.10.5|]
 configFooter :: String
 configFooter = [s|Examples:
 # show current config
 ghcup config
 # initialize config
 ghcup config init
 # set <key> <value> configuration pair
 ghcup config <key> <value>|]
 installCabalFooter :: String
 installCabalFooter = [s|Discussion:
@@ -595,7 +574,7 @@ Examples:
 installOpts :: Maybe Tool -> Parser InstallOptions
 installOpts tool =
-  (\p (u, v) b is -> InstallOptions v p u b is)
+  (\p (u, v) b -> InstallOptions v p u b)
    <$> optional
          (option
            (eitherReader platformParser)
@@ -624,15 +603,6 @@ installOpts tool =
          (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"
           )
          )
 setParser :: Parser (Either SetCommand SetOptions)
@@ -816,19 +786,6 @@ Examples:
  # build cross compiler
  ghcup compile ghc -j 4 -v 8.4.2 -b 8.2.2 -x armv7-unknown-linux-gnueabihf --config $(pwd)/build.mk -- --enable-unregisterised|]
 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")
 whereisP :: Parser WhereisCommand
 whereisP = subparser
@@ -1043,15 +1000,6 @@ ghcCompileOpts =
    <*> switch
          (long "hadrian" <> help "Use the hadrian build system instead of make (only git versions seem to be properly supported atm)"
          )
    <*> optional
          (option
            (eitherReader isolateParser)
            (  short 'i'
            <> long "isolate"
            <> metavar "DIR"
            <> help "install in an isolated directory instead of the default one, no symlinks to this installation will be made"
            )
           )
 toolVersionParser :: Parser ToolVersion
@@ -1086,7 +1034,7 @@ setVersionArgument criteria tool =
    <|> second SetToolVersion (tVersionEither s')
  parseSet s' = case fmap toLower s' of
                  "next" -> Right SetNext
-                  other  -> Left $ "Unknown tag/version " <> other
+                  other  -> Left [i|Unknown tag/version #{other}|]
 versionArgument :: Maybe ListCriteria -> Maybe Tool -> Parser GHCTargetVersion
@@ -1169,8 +1117,8 @@ tagEither s' = case fmap toLower s' of
  "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'
+                                  Left  _ -> Left [i|Invalid PVP version for base #{ver'}|]
-  other         -> Left $ "Unknown tag " <> other
+  other         -> Left [i|Unknown tag #{other}|]
 tVersionEither :: String -> Either String GHCTargetVersion
@@ -1267,10 +1215,6 @@ platformParser s' = case MP.parse (platformP <* MP.eof) "" (T.pack s') of
 bindistParser :: String -> Either String URI
 bindistParser = first show . parseURI strictURIParserOptions . UTF8.fromString
 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."
 toSettings :: Options -> IO (Settings, KeyBindings)
 toSettings options = do
@@ -1314,21 +1258,6 @@ toSettings options = do
         , bShowAllTools = fromMaybe bShowAllTools kShowAllTools
         }
 updateSettings :: Monad m => UTF8.ByteString -> Settings -> Excepts '[JSONError] m Settings
 updateSettings config settings = do
  settings' <- lE' JSONDecodeError . first show . Y.decodeEither' $ 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
     in Settings cache' noVerify' keepDirs' downloader' verbose' urlSource' noNetwork'
 upgradeOptsP :: Parser UpgradeOpts
 upgradeOptsP =
@@ -1363,11 +1292,6 @@ describe_result = $( LitE . StringL <$>
                     )
                   )
 formatConfig :: UserSettings -> String
 formatConfig settings
  = UTF8.toString . YP.encodePretty yamlConfig $ settings
 where
  yamlConfig = YP.setConfCompare compare YP.defConfig
 main :: IO ()
 main = do
@@ -1465,7 +1389,7 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                let s' = AppState settings dirs keybindings ghcupInfo pfreq
                race_ (liftIO $ runLogger $ flip runReaderT dirs $ cleanupTrash)
-                      (threadDelay 5000000 >> runLogger ($(logWarn) $ "Killing cleanup thread (exceeded 5s timeout)... please remove leftover files in " <> T.pack recycleDir <> " manually"))
+                      (threadDelay 5000000 >> runLogger ($(logWarn) [i|Killing cleanup thread (exceeded 5s timeout)... please remove leftover files in #{recycleDir} manually|]))
                case optCommand of
                  Nuke -> pure ()
@@ -1516,11 +1440,11 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                  . runE
                    @'[ AlreadyInstalled
                      , UnknownArchive
 #if !defined(TAR)
                      , ArchiveResult
 #endif
                      , FileDoesNotExistError
                      , CopyError
                      , NotInstalled
                      , DirNotEmpty
                      , NoDownload
                      , NotInstalled
                      , BuildFailed
@@ -1530,7 +1454,6 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                      , TarDirDoesNotExist
                      , NextVerNotFound
                      , NoToolVersionSet
                      , FileAlreadyExistsError
                      ]
          let runInstTool mInstPlatform action' = do
@@ -1632,8 +1555,9 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                      , UnknownArchive
                      , TarDirDoesNotExist
                      , NotInstalled
-                      , DirNotEmpty
+#if !defined(TAR)
                      , ArchiveResult
 #endif
                      ]
          let
@@ -1693,23 +1617,22 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
          -----------------------
          let installGHC InstallOptions{..} =
-                (case instBindist of
+                  (case instBindist of
-                   Nothing -> runInstTool instPlatform $ do
+                     Nothing -> runInstTool instPlatform $ do
                     (v, vi) <- liftE $ fromVersion instVer GHC
                     liftE $ installGHCBin (_tvVersion v) isolateDir
                     when instSet $ void $ liftE $ setGHC v SetGHCOnly
                     pure vi
                   Just uri -> do
                     s' <- liftIO appState
                     runInstTool' s'{ settings = settings {noVerify = True}} instPlatform $ do
                       (v, vi) <- liftE $ fromVersion instVer GHC
-                       liftE $ installGHCBindist
+                       liftE $ installGHCBin (_tvVersion v)
                         (DownloadInfo uri (Just $ RegexDir "ghc-.*") "")
                         (_tvVersion v)
                         isolateDir
                       when instSet $ void $ liftE $ setGHC v SetGHCOnly
                       pure vi
-                  )
+                     Just uri -> do
                       s' <- liftIO appState
                       runInstTool' s'{ settings = settings {noVerify = True}} instPlatform $ do
                         (v, vi) <- liftE $ fromVersion instVer GHC
                         liftE $ installGHCBindist
                           (DownloadInfo uri (Just $ RegexDir "ghc-.*") "")
                           (_tvVersion v)
                         when instSet $ void $ liftE $ setGHC v SetGHCOnly
                         pure vi
                    )
                    >>= \case
                          VRight vi -> do
                            runLogger $ $(logInfo) "GHC installation successful"
@@ -1717,20 +1640,20 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                              runLogger $ $(logInfo) msg
                            pure ExitSuccess
                          VLeft (V (AlreadyInstalled _ v)) -> do
-                            runLogger $ $(logWarn) $
+                            runLogger $ $(logWarn)
-                              "GHC ver " <> prettyVer v <> " already installed; if you really want to reinstall it, you may want to run 'ghcup rm ghc " <> prettyVer v <> "' first"
+                              [i|GHC ver #{prettyVer v} already installed; if you really want to reinstall it, you may want to run 'ghcup rm ghc #{prettyVer v}' first|]
                            pure ExitSuccess
                          VLeft err@(V (BuildFailed tmpdir _)) -> do
                            case keepDirs settings of
                              Never -> myLoggerT loggerConfig $ ($(logError) $ T.pack $ prettyShow err)
-                              _ -> myLoggerT loggerConfig $ ($(logError) $ T.pack (prettyShow err) <> "\n" <>
+                              _ -> myLoggerT loggerConfig $ ($(logError) [i|#{prettyShow err}
-                                "Check the logs at " <> T.pack logsDir <> " and the build directory " <> T.pack tmpdir <> " for more clues." <> "\n" <>
+    Check the logs at #{logsDir} and the build directory #{tmpdir} for more clues.
-                                "Make sure to clean up " <> T.pack tmpdir <> " afterwards.")
+    Make sure to clean up #{tmpdir} afterwards.|])
                            pure $ ExitFailure 3
                          VLeft e -> do
                            runLogger $ do
                              $(logError) $ T.pack $ prettyShow e
-                              $(logError) $ "Also check the logs in " <> T.pack logsDir
+                              $(logError) [i|Also check the logs in #{logsDir}|]
                            pure $ ExitFailure 3
@@ -1738,7 +1661,7 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                (case instBindist of
                   Nothing -> runInstTool instPlatform $ do
                     (v, vi) <- liftE $ fromVersion instVer Cabal
-                     liftE $ installCabalBin (_tvVersion v) isolateDir
+                     liftE $ installCabalBin (_tvVersion v)
                     pure vi
                   Just uri -> do
                     s' <- appState
@@ -1747,7 +1670,6 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                       liftE $ installCabalBindist
                           (DownloadInfo uri Nothing "")
                           (_tvVersion v)
                           isolateDir
                       pure vi
                  )
                  >>= \case
@@ -1757,20 +1679,20 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                            runLogger $ $(logInfo) msg
                          pure ExitSuccess
                        VLeft (V (AlreadyInstalled _ v)) -> do
-                          runLogger $ $(logWarn) $
+                          runLogger $ $(logWarn)
-                            "Cabal ver " <> prettyVer v <> " already installed; if you really want to reinstall it, you may want to run 'ghcup rm cabal " <> prettyVer v <> "' first"
+                            [i|Cabal ver #{prettyVer v} already installed; if you really want to reinstall it, you may want to run 'ghcup rm cabal #{prettyVer v}' first|]
                          pure ExitSuccess
                        VLeft e -> do
                          runLogger $ do
                            $(logError) $ T.pack $ prettyShow e
-                            $(logError) $ "Also check the logs in " <> T.pack logsDir
+                            $(logError) [i|Also check the logs in #{logsDir}|]
                          pure $ ExitFailure 4
          let installHLS InstallOptions{..} =
-                 (case instBindist of
+                (case instBindist of
                   Nothing -> runInstTool instPlatform $ do
                     (v, vi) <- liftE $ fromVersion instVer HLS
-                     liftE $ installHLSBin (_tvVersion v) isolateDir
+                     liftE $ installHLSBin (_tvVersion v)
                     pure vi
                   Just uri -> do
                     s' <- appState
@@ -1779,7 +1701,6 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                       liftE $ installHLSBindist
                           (DownloadInfo uri Nothing "")
                           (_tvVersion v)
                           isolateDir
                       pure vi
                  )
                  >>= \case
@@ -1789,34 +1710,29 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                            runLogger $ $(logInfo) msg
                          pure ExitSuccess
                        VLeft (V (AlreadyInstalled _ v)) -> do
-                          runLogger $ $(logWarn) $
+                          runLogger $ $(logWarn)
-                              "HLS ver "
+                            [i|HLS ver #{prettyVer v} already installed; if you really want to reinstall it, you may want to run 'ghcup rm hls #{prettyVer v}' first|]
                            <> prettyVer v
                            <> " already installed; if you really want to reinstall it, you may want to run 'ghcup rm hls "
                            <> prettyVer v
                            <> "' first"
                          pure ExitSuccess
                        VLeft e -> do
                          runLogger $ do
                            $(logError) $ T.pack $ prettyShow e
-                            $(logError) $ "Also check the logs in " <> T.pack logsDir
+                            $(logError) [i|Also check the logs in #{logsDir}|]
                          pure $ ExitFailure 4
          let installStack InstallOptions{..} =
-                 (case instBindist of
+                (case instBindist of
-                    Nothing -> runInstTool instPlatform $ do
+                   Nothing -> runInstTool instPlatform $ do
-                      (v, vi) <- liftE $ fromVersion instVer Stack
+                     (v, vi) <- liftE $ fromVersion instVer Stack
-                      liftE $ installStackBin (_tvVersion v) isolateDir
+                     liftE $ installStackBin (_tvVersion v)
-                      pure vi
+                     pure vi
-                    Just uri -> do
+                   Just uri -> do
-                      s' <- appState
+                     s' <- appState
-                      runInstTool' s'{ settings = settings { noVerify = True}} instPlatform $ do
+                     runInstTool' s'{ settings = settings { noVerify = True}} instPlatform $ do
-                        (v, vi) <- liftE $ fromVersion instVer Stack
+                       (v, vi) <- liftE $ fromVersion instVer Stack
-                        liftE $ installStackBindist
+                       liftE $ installStackBindist
-                            (DownloadInfo uri Nothing "")
+                           (DownloadInfo uri Nothing "")
-                            (_tvVersion v)
+                           (_tvVersion v)
-                            isolateDir
+                       pure vi
                        pure vi
                  )
                  >>= \case
                        VRight vi -> do
@@ -1825,13 +1741,13 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                            runLogger $ $(logInfo) msg
                          pure ExitSuccess
                        VLeft (V (AlreadyInstalled _ v)) -> do
-                          runLogger $ $(logWarn) $
+                          runLogger $ $(logWarn)
-                            "Stack ver " <> prettyVer v <> " already installed; if you really want to reinstall it, you may want to run 'ghcup rm stack " <> prettyVer v <> "' first"
+                            [i|Stack ver #{prettyVer v} already installed; if you really want to reinstall it, you may want to run 'ghcup rm stack #{prettyVer v}' first|]
                          pure ExitSuccess
                        VLeft e -> do
                          runLogger $ do
                            $(logError) $ T.pack $ prettyShow e
-                            $(logError) $ "Also check the logs in " <> T.pack logsDir
+                            $(logError) [i|Also check the logs in #{logsDir}|]
                          pure $ ExitFailure 4
@@ -1845,8 +1761,8 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                  >>= \case
                        VRight GHCTargetVersion{..} -> do
                          runLogger
-                            $ $(logInfo) $
+                            $ $(logInfo)
-                                "GHC " <> prettyVer _tvVersion <> " successfully set as default version" <> maybe "" (" for cross target " <>) _tvTarget
+                                [i|GHC #{prettyVer _tvVersion} successfully set as default version#{maybe "" (" for cross target " <>) _tvTarget}|]
                          pure ExitSuccess
                        VLeft e -> do
                          runLogger $ $(logError) $ T.pack $ prettyShow e
@@ -1863,8 +1779,8 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                  >>= \case
                        VRight GHCTargetVersion{..} -> do
                          runLogger
-                            $ $(logInfo) $
+                            $ $(logInfo)
-                                "Cabal " <> prettyVer _tvVersion <> " successfully set as default version"
+                                [i|Cabal #{prettyVer _tvVersion} successfully set as default version|]
                          pure ExitSuccess
                        VLeft  e -> do
                          runLogger $ $(logError) $ T.pack $ prettyShow e
@@ -1881,8 +1797,8 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                  >>= \case
                        VRight GHCTargetVersion{..} -> do
                          runLogger
-                            $ $(logInfo) $
+                            $ $(logInfo)
-                                "HLS " <> prettyVer _tvVersion <> " successfully set as default version"
+                                [i|HLS #{prettyVer _tvVersion} successfully set as default version|]
                          pure ExitSuccess
                        VLeft  e -> do
                          runLogger $ $(logError) $ T.pack $ prettyShow e
@@ -1899,8 +1815,8 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                  >>= \case
                        VRight GHCTargetVersion{..} -> do
                          runLogger
-                            $ $(logInfo) $
+                            $ $(logInfo)
-                                "Stack " <> prettyVer _tvVersion <> " successfully set as default version"
+                                [i|Stack #{prettyVer _tvVersion} successfully set as default version|]
                          pure ExitSuccess
                        VLeft  e -> do
                          runLogger $ $(logError) $ T.pack $ prettyShow e
@@ -1977,18 +1893,18 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
              liftIO $ brickMain s' loggerConfig >> pure ExitSuccess
 #endif
            Install (Right iopts) -> do
-              runLogger ($(logWarn) "This is an old-style command for installing GHC. Use 'ghcup install ghc' instead.")
+              runLogger ($(logWarn) [i|This is an old-style command for installing GHC. Use 'ghcup install ghc' instead.|])
              installGHC iopts
            Install (Left (InstallGHC iopts)) -> installGHC iopts
            Install (Left (InstallCabal iopts)) -> installCabal iopts
            Install (Left (InstallHLS iopts)) -> installHLS iopts
            Install (Left (InstallStack iopts)) -> installStack iopts
            InstallCabalLegacy iopts -> do
-              runLogger ($(logWarn) "This is an old-style command for installing cabal. Use 'ghcup install cabal' instead.")
+              runLogger ($(logWarn) [i|This is an old-style command for installing cabal. Use 'ghcup install cabal' instead.|])
              installCabal iopts
            Set (Right sopts) -> do
-              runLogger ($(logWarn) "This is an old-style command for setting GHC. Use 'ghcup set ghc' instead.")
+              runLogger ($(logWarn) [i|This is an old-style command for setting GHC. Use 'ghcup set ghc' instead.|])
              setGHC' sopts
            Set (Left (SetGHC sopts)) -> setGHC' sopts
            Set (Left (SetCabal sopts)) -> setCabal' sopts
@@ -2003,7 +1919,7 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                )
            Rm (Right rmopts) -> do
-              runLogger ($(logWarn) "This is an old-style command for removing GHC. Use 'ghcup rm ghc' instead.")
+              runLogger ($(logWarn) [i|This is an old-style command for removing GHC. Use 'ghcup rm ghc' instead.|])
              rmGHC' rmopts
            Rm (Left (RmGHC rmopts)) -> rmGHC' rmopts
            Rm (Left (RmCabal rmopts)) -> rmCabal' rmopts
@@ -2045,7 +1961,6 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                            addConfArgs
                            buildFlavour
                            hadrian
                            isolateDir
                GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
                let vi = getVersionInfo (_tvVersion targetVer) GHC dls
                when setCompile $ void $ liftE $
@@ -2061,51 +1976,20 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                        putStr (T.unpack $ tVerToText tv)
                        pure ExitSuccess
                      VLeft (V (AlreadyInstalled _ v)) -> do
-                        runLogger $ $(logWarn) $
+                        runLogger $ $(logWarn)
-                          "GHC ver " <> prettyVer v <> " already installed; if you really want to reinstall it, you may want to run 'ghcup rm ghc " <> prettyVer v <> "' first"
+                          [i|GHC ver #{prettyVer v} already installed; if you really want to reinstall it, you may want to run 'ghcup rm ghc #{prettyVer v}' first|]
                        pure ExitSuccess
                      VLeft err@(V (BuildFailed tmpdir _)) -> do
                        case keepDirs settings of
                          Never -> myLoggerT loggerConfig $ $(logError) $ T.pack $ prettyShow err
-                          _ -> myLoggerT loggerConfig $ ($(logError) $ T.pack (prettyShow err) <> "\n" <>
+                          _ -> myLoggerT loggerConfig $ ($(logError) [i|#{prettyShow err}
-                                "Check the logs at " <> T.pack logsDir <> " and the build directory "
+Check the logs at #{logsDir} and the build directory #{tmpdir} for more clues.
-                                <> T.pack tmpdir <> " for more clues." <> "\n" <>
+Make sure to clean up #{tmpdir} afterwards.|])
                                "Make sure to clean up " <> T.pack tmpdir <> " afterwards.")
                        pure $ ExitFailure 9
                      VLeft e -> do
                        runLogger $ $(logError) $ T.pack $ prettyShow e
                        pure $ ExitFailure 9
            Config InitConfig -> do
              path <- getConfigFilePath
              writeFile path $ formatConfig $ fromSettings settings (Just keybindings)
              runLogger $ $(logDebug) $ "config.yaml initialized at " <> T.pack path
              pure ExitSuccess
            Config ShowConfig -> do
              putStrLn $ formatConfig $ fromSettings settings (Just keybindings)
              pure ExitSuccess
            Config (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)
                    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
            Whereis WhereisOptions{..} (WhereisTool tool (Just (ToolVersion v))) ->
              runLeanWhereIs (do
                loc <- liftE $ whereIsTool tool v
@@ -2151,13 +2035,13 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                  VRight (v', dls) -> do
                    let pretty_v = prettyVer v'
                    let vi = fromJust $ snd <$> getLatest dls GHCup
-                    runLogger $ $(logInfo) $
+                    runLogger $ $(logInfo)
-                      "Successfully upgraded GHCup to version " <> pretty_v
+                      [i|Successfully upgraded GHCup to version #{pretty_v}|]
                    forM_ (_viPostInstall vi) $ \msg ->
                      runLogger $ $(logInfo) msg
                    pure ExitSuccess
                  VLeft (V NoUpdate) -> do
-                    runLogger $ $(logWarn) "No GHCup update available"
+                    runLogger $ $(logWarn) [i|No GHCup update available|]
                    pure ExitSuccess
                  VLeft e -> do
                    runLogger $ $(logError) $ T.pack $ prettyShow e
@@ -2195,8 +2079,8 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
              case muri of
                Nothing -> do
                  runLogger
-                    ($(logWarn) $
+                    ($(logWarn)
-                      "Could not find ChangeLog for " <> T.pack (prettyShow tool) <> ", version " <> either prettyVer (T.pack . show) ver'
+                      [i|Could not find ChangeLog for #{tool}, version #{either (T.unpack . prettyVer) show ver'}|]
                    )
                  pure ExitSuccess
                Just uri -> do
@@ -2218,7 +2102,7 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                             Nothing
                          >>= \case
                                Right _ -> pure ExitSuccess
-                                Left  e -> runLogger ($(logError) (T.pack $ prettyShow e))
+                                Left  e -> runLogger ($(logError) [i|#{e}|])
                                  >> pure (ExitFailure 13)
                    else putStrLn uri' >> pure ExitSuccess
@@ -2571,46 +2455,46 @@ checkForUpdates = do
  forM_ (getLatest dls GHCup) $ \(l, _) -> do
    (Right ghc_ver) <- pure $ version $ prettyPVP ghcUpVer
    when (l > ghc_ver)
-      $ $(logWarn) $
+      $ $(logWarn)
-          "New GHCup version available: " <> prettyVer l <> ". To upgrade, run 'ghcup upgrade'"
+          [i|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) $
+        $ $(logWarn)
-          "New GHC version available: " <> prettyVer l <> ". To upgrade, run 'ghcup install ghc " <> prettyVer l <> "'"
+            [i|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) $
+        $ $(logWarn)
-          "New Cabal version available: " <> prettyVer l <> ". To upgrade, run 'ghcup install cabal " <> prettyVer l <> "'"
+            [i|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) $
+        $ $(logWarn)
-          "New HLS version available: " <> prettyVer l <> ". To upgrade, run 'ghcup install hls " <> prettyVer l <> "'"
+            [i|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) $
+        $ $(logWarn)
-          "New Stack version available: " <> prettyVer l <> ". To upgrade, run 'ghcup install stack " <> prettyVer l <> "'"
+            [i|New Stack version available: #{prettyVer l}. To upgrade, run 'ghcup install stack #{prettyVer l}'|]
 prettyDebugInfo :: DebugInfo -> String
-prettyDebugInfo DebugInfo {..} = "Debug Info" <> "\n" <>
+prettyDebugInfo DebugInfo {..} = [i|Debug Info
-  "==========" <> "\n" <>
+==========
-  "GHCup base dir: " <> diBaseDir <> "\n" <>
+GHCup base dir: #{diBaseDir}
-  "GHCup bin dir: " <> diBinDir <> "\n" <>
+GHCup bin dir: #{diBinDir}
-  "GHCup GHC directory: " <> diGHCDir <> "\n" <>
+GHCup GHC directory: #{diGHCDir}
-  "GHCup cache directory: " <> diCacheDir <> "\n" <>
+GHCup cache directory: #{diCacheDir}
-  "Architecture: " <> prettyShow diArch <> "\n" <>
+Architecture: #{prettyShow diArch}
-  "Platform: " <> prettyShow diPlatform <> "\n" <>
+Platform: #{prettyShow diPlatform}
-  "Version: " <> describe_result
+Version: #{describe_result}|]
--- a/46
+++ b/46
@@ -8,6 +8,7 @@
 #   * BOOTSTRAP_HASKELL_GHC_VERSION - the ghc version to install
 #   * BOOTSTRAP_HASKELL_CABAL_VERSION - the cabal version to install
 #   * BOOTSTRAP_HASKELL_INSTALL_STACK - whether to install latest stack
 #   * BOOTSTRAP_HASKELL_INSTALL_STACK_HOOK - whether to install stack hook as well
 #   * BOOTSTRAP_HASKELL_INSTALL_HLS - whether to install latest hls
 #   * BOOTSTRAP_HASKELL_ADJUST_BASHRC - whether to adjust PATH in bashrc (prepend)
 #   * BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG - whether to adjust mingw paths in cabal.config on windows
@@ -20,7 +21,7 @@
 plat="$(uname -s)"
 arch=$(uname -m)
-ghver="0.1.16.2"
+ghver="0.1.16.1"
 base_url="https://downloads.haskell.org/~ghcup"
 export GHCUP_SKIP_UPDATE_CHECK=yes
@@ -275,8 +276,6 @@ find_shell() {
 ask_bashrc() {
 	if [ -n "${BOOTSTRAP_HASKELL_ADJUST_BASHRC}" ] ; then
 		return 1
 	elif [ -z "${MY_SHELL}" ] ; then
 		return 0
 	fi
 	while true; do
@@ -510,17 +509,25 @@ ask_hls() {
 ask_stack() {
 	if [ -n "${BOOTSTRAP_HASKELL_INSTALL_STACK}" ] ; then
-		return 1
+		if [ -n "${BOOTSTRAP_HASKELL_INSTALL_STACK_HOOK}" ] ; then
 			return 2
 		else
 			return 1
 		fi
 	fi
 	if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
 		echo "-------------------------------------------------------------------------------"
-		warn "Do you want to install stack?"
+		warn "Do you want to install stack and stack hooks?"
 		warn ""
 		warn "Stack is a haskell build tool similar to cabal that is used by some projects."
 		warn "Also see https://docs.haskellstack.org/"
 		warn ""
-		warn "[Y] Yes  [N] No  [?] Help (default is \"N\")."
+		warn "Stack hooks allow stack to use ghcup for GHC installation (usually stack handles"
 		warn "installation itself, leading to possibly duplicated GHC versions)."
 		warn ""
 		warn "[Y] Yes, with hooks  [L] Yes, no hooks  [N] No  [?] Help (default is \"N\")."
 		warn ""
 		while true; do
@@ -528,13 +535,16 @@ ask_stack() {
 			case $stack_answer in
 				[Yy]*)
 					return 2 ;;
 				[Ll]*)
 					return 1 ;;
 				[Nn]* | "")
 					return 0 ;;
 				*)
 					echo "Possible choices are:"
 					echo
-					echo "Y - Yes, install stack"
+					echo "Y - Yes, install stack with hooks"
 					echo "L - Yes, install stack without hooks"
 					echo "N - No, don't install anything more (default)"
 					echo
 					echo "Please make your choice and press ENTER."
@@ -638,7 +648,27 @@ esac
 case $ask_stack_answer in
 	1)
-		_eghcup --cache install stack || warn "Stack installation failed, continuing anyway"
+		{
 			_eghcup --cache install stack
 			edo stack update
 		} || warn "Stack installation failed, continuing anyway"
 		;;
 	2)
 		{
 			_eghcup --cache install stack
 		    edo stack update
 			if [ -n "${STACK_ROOT}" ] ; then
 				stack_root=$STACK_ROOT
 			else
 				stack_root=${HOME}/.stack
 			fi
 			edo mkdir -p "${stack_root}/hooks/"
 			edo curl -Lf "https://www.haskell.org/ghcup/sh/hooks/stack/ghc-install.sh" > "${stack_root}/hooks/ghc-install.sh"
 			edo chmod +x "${stack_root}/hooks/ghc-install.sh"
 			edo stack config set system-ghc  false --global
 			edo stack config set install-ghc false --global
 		} || warn "Stack installation failed, continuing anyway"
 		;;
 	*) ;;
 esac
--- a/bootstrap-haskell.ps1
+++ b/bootstrap-haskell.ps1
@@ -29,6 +29,8 @@ param (
    [switch]$InBash,
    # Whether to install stack as well
    [switch]$InstallStack,
    # Whether to install stack hooks as well
    [switch]$InstallStackHook,
    # Whether to install hls as well
    [switch]$InstallHLS,
    # Skip adjusting cabal.config with mingw paths
@@ -158,26 +160,6 @@ $ErrorActionPreference = 'Stop'
 $GhcupBasePrefixEnv = [System.Environment]::GetEnvironmentVariable('GHCUP_INSTALL_BASE_PREFIX', 'user')
 if (Get-Command -Name 'chocolatey.exe' -ErrorAction SilentlyContinue) {
  if (!($Silent)) {
    Print-Msg -color Magenta -msg (@'
 Chocolatey was detected on your system. It is capable of installing the Haskell toolchain as well.
 If you want to rather use that instead of ghcup, abort the installation and run the following at an
 elevated command prompt:
    choco install haskell-dev
    refreshenv
 '@)
    $decision = $Host.UI.PromptForChoice(''
    , 'Continue with GHCup installation?'
    , [System.Management.Automation.Host.ChoiceDescription[]] @('&Continue'
        '&Abort'), 0)
    if ($decision -eq 1) {
      Exit 0
    }
  }
 }
 if ($GhcupBasePrefixEnv) {
  $defaultGhcupBasePrefix = $GhcupBasePrefixEnv
 } else {
@@ -243,6 +225,7 @@ $null = [Environment]::SetEnvironmentVariable("GHCUP_INSTALL_BASE_PREFIX", $Ghcu
 $GhcupDir = ('{0}\ghcup' -f $GhcupBasePrefix)
 $StackDir = ('{0}\sr' -f $GhcupBasePrefix)
 $MsysDir = ('{0}\msys64' -f $GhcupDir)
 $Bash = ('{0}\usr\bin\bash' -f $MsysDir)
 if (!($BootstrapUrl)) {
@@ -330,15 +313,28 @@ if (!($InstallHLS)) {
 }
 # ask whether to install stack
 $InstallStackDoc = @'
 Do you want to install stack and stack hooks?
 Stack is a haskell build tool similar to cabal that is used by some projects.
 Also see https://docs.haskellstack.org/
 Stack hooks allow stack to use ghcup for GHC installation (usually stack handles
 installation itself, leading to possibly duplicated GHC versions).
 '@
 if (!($InstallStack)) {
  if (!($Silent)) {
    $StackDecision = $Host.UI.PromptForChoice('Install stack'
-      , 'Do you want to install stack as well?'
+      , $InstallStackDoc
-      , [System.Management.Automation.Host.ChoiceDescription[]] @('&Yes'
+      , [System.Management.Automation.Host.ChoiceDescription[]] @('&Yes, with hooks'
          '&Light install, without hooks'
          '&No'
-          '&Abort'), 1)
+          '&Abort'), 2)
    if ($StackDecision -eq 0) {
      $InstallStack = $true
 	  $InstallStackHook = $true
    } elseif ($StackDecision -eq 1) {
      $InstallStack = $true
    } elseif ($StackDecision -eq 2) {
      Exit 0
@@ -391,7 +387,7 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
    Exec "$Bash" '-lc' 'pacman --noconfirm -Syuu'
    Print-Msg -msg 'Installing Dependencies...'
-    Exec "$Bash" '-lc' 'pacman --noconfirm -S --needed curl autoconf mingw-w64-x86_64-pkgconf'
+    Exec "$Bash" '-lc' 'pacman --noconfirm -S --needed curl mingw-w64-x86_64-pkgconf'
    Print-Msg -msg 'Updating SSL root certificate authorities...'
    Exec "$Bash" '-lc' 'pacman --noconfirm -S ca-certificates'
@@ -519,6 +515,11 @@ $SilentExport = 'export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 ;'
 if ($InstallStack) {
  $StackInstallExport = 'export BOOTSTRAP_HASKELL_INSTALL_STACK=1 ;'
  $null = [Environment]::SetEnvironmentVariable("STACK_ROOT", $StackDir, [System.EnvironmentVariableTarget]::User)
 }
 if ($InstallStackHook) {
  $StackInstallHookExport = 'export BOOTSTRAP_HASKELL_INSTALL_STACK_HOOK=1 ;'
 }
 if ($InstallHLS) {
@@ -530,9 +531,9 @@ if (!($NoAdjustCabalConfig)) {
 }
 if ((Get-Process -ID $PID).ProcessName.StartsWith("bootstrap-haskell") -Or $InBash) {
-  Exec "$Bash" '-lc' ('{4} {6} {7} {8} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; [[ ''{0}'' = https* ]]  && curl --proto ''=https'' --tlsv1.2 -sSf {0} | bash || cat $(cygpath -m ''{0}'') | bash' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport)
+  Exec "$Bash" '-lc' ('{4} {6} {7} {8} {9} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; export STACK_ROOT=$(cygpath -m ''{10}/'') ; [[ ''{0}'' = https* ]]  && curl --proto ''=https'' --tlsv1.2 -sSf {0} | bash || cat $(cygpath -m ''{0}'') | bash' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport, $StackInstallHookExport, $StackDir)
 } else {
-  Exec "$Msys2Shell" '-mingw64' '-mintty' '-c' ('{4} {6} {7} {8} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; trap ''echo Press any key to exit && read -n 1 && exit'' 2 ; [[ ''{0}'' = https* ]]  && curl --proto ''=https'' --tlsv1.2 -sSf {0} | bash || cat $(cygpath -m ''{0}'') | bash ; echo ''Press any key to exit'' && read -n 1' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport)
+  Exec "$Msys2Shell" '-mingw64' '-mintty' '-c' ('{4} {6} {7} {8} {9} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; export STACK_ROOT=$(cygpath -m ''{10}/'') ; trap ''echo Press any key to exit && read -n 1 && exit'' 2 ; [[ ''{0}'' = https* ]]  && curl --proto ''=https'' --tlsv1.2 -sSf {0} | bash || cat $(cygpath -m ''{0}'') | bash ; echo ''Press any key to exit'' && read -n 1' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport, $StackInstallHookExport, $StackDir)
 }
--- a/cabal.project
+++ b/cabal.project
@@ -10,13 +10,18 @@ package ghcup
 source-repository-package
    type: git
-    location: https://github.com/bgamari/terminal-size
+    location: https://github.com/jtdaugherty/brick.git
-    tag: 34ea816bd63f75f800eedac12c6908c6f3736036
+    tag: b3b96cfe66dfd398d338e3feb2b6855e66a35190
 source-repository-package
    type: git
-    location: https://github.com/hasufell/libarchive
+    location: https://github.com/Bodigrim/tar
-    tag: 024a7e8ab7b4d3848dc64dca1e70a04831eedc99
+    tag: ac197ec7ea4838dc2b4e22b9b888b080cedf29cf
 source-repository-package
    type: git
    location: https://github.com/bgamari/terminal-size
    tag: 34ea816bd63f75f800eedac12c6908c6f3736036
 constraints: http-io-streams -brotli
--- a/ghcup-0.0.1.json
+++ b/ghcup-0.0.1.json
@@ -2132,7 +2132,7 @@
      }
    },
    "GHCup": {
-      "0.1.16.2": {
+      "0.1.16.1": {
        "viTags": [
          "Recommended",
          "Latest"
@@ -2143,32 +2143,32 @@
          "A_64": {
            "Linux_UnknownLinux": {
              "unknown_versioning": {
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2",
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-linux-ghcup-0.1.16.1",
                "dlSubdir": null,
-                "dlHash": "d5e43b95ce1d42263376e414f7eb7c5dd440271c7c6cd9bad446fdeff3823893"
+                "dlHash": "c3505d929722e245b22ec7a05267f1ae8e04089e139bbb470783eb9a1b648f83"
              }
            },
            "Darwin": {
              "unknown_versioning": {
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-apple-darwin-ghcup-0.1.16.2",
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-apple-darwin-ghcup-0.1.16.1",
                "dlSubdir": null,
-                "dlHash": "a334620ccce7705211b2142882dde544003e6030af4b91a44c890542a90f879f"
+                "dlHash": "7edde6bb42323232d28495abbe630321d7eb8e3827e200438a9ae4c41e531e71"
              }
            },
            "FreeBSD": {
              "unknown_versioning": {
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-portbld-freebsd-ghcup-0.1.16.2",
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-portbld-freebsd-ghcup-0.1.16.1",
                "dlSubdir": null,
-                "dlHash": "92359592a5694375e53b22628920086bf4bbf0faff5be018a0ed3e745a6426a9"
+                "dlHash": "6b7fc3a52e859f186d30b04c823fd0c5997179222fe9aa510a33435f41599f5c"
              }
            }
          },
          "A_32": {
            "Linux_UnknownLinux": {
              "unknown_versioning": {
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.16.2/i386-linux-ghcup-0.1.16.2",
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.16.1/i386-linux-ghcup-0.1.16.1",
                "dlSubdir": null,
-                "dlHash": "01968ca6decac7b6e8ba6e2c817870d3fa47289a6507e0c1ab563f7b6eec0e38"
+                "dlHash": "93ca5d77247b6ecac01be75e9ef5454adbb503b7957b8e9c59a5abd2046aef3c"
              }
            }
          }
--- a/ghcup-0.0.2.json
+++ b/ghcup-0.0.2.json
--- a/ghcup-0.0.2.yaml
+++ b/ghcup-0.0.2.yaml
@@ -1384,7 +1384,7 @@ ghcupDownloads:
              dlUri: https://oleg.fi/cabal-install-3.4.0.0-rc4/cabal-install-3.4.0.0-x86_64-freebsd-12.1-release.tar.xz
              dlHash: 9705e16d03497b46be4ad477e6c64d10890af853eafa8a9adf6dba89aa9e05f7
  GHCup:
-    0.1.16.2:
+    0.1.16.1:
      viTags:
      - Recommended
      - Latest
@@ -1394,22 +1394,22 @@ ghcupDownloads:
        A_64:
          Linux_UnknownLinux:
            unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-linux-ghcup-0.1.16.1
-              dlHash: d5e43b95ce1d42263376e414f7eb7c5dd440271c7c6cd9bad446fdeff3823893
+              dlHash: c3505d929722e245b22ec7a05267f1ae8e04089e139bbb470783eb9a1b648f83
          Darwin:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-apple-darwin-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-apple-darwin-ghcup-0.1.16.1
-              dlHash: a334620ccce7705211b2142882dde544003e6030af4b91a44c890542a90f879f
+              dlHash: 7edde6bb42323232d28495abbe630321d7eb8e3827e200438a9ae4c41e531e71
          FreeBSD:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-portbld-freebsd-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-portbld-freebsd-ghcup-0.1.16.1
-              dlHash: 92359592a5694375e53b22628920086bf4bbf0faff5be018a0ed3e745a6426a9
+              dlHash: 6b7fc3a52e859f186d30b04c823fd0c5997179222fe9aa510a33435f41599f5c
          Linux_Alpine:
            unknown_versioning: *ghcup-64
        A_32:
          Linux_UnknownLinux:
            unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/i386-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/i386-linux-ghcup-0.1.16.1
-              dlHash: 01968ca6decac7b6e8ba6e2c817870d3fa47289a6507e0c1ab563f7b6eec0e38
+              dlHash: 93ca5d77247b6ecac01be75e9ef5454adbb503b7957b8e9c59a5abd2046aef3c
          Linux_Alpine:
            unknown_versioning: *ghcup-32
--- a/ghcup-0.0.3.yaml
+++ b/ghcup-0.0.3.yaml
@@ -1451,7 +1451,7 @@ ghcupDownloads:
              dlUri: https://oleg.fi/cabal-install-3.4.0.0-rc4/cabal-install-3.4.0.0-x86_64-freebsd-12.1-release.tar.xz
              dlHash: 9705e16d03497b46be4ad477e6c64d10890af853eafa8a9adf6dba89aa9e05f7
  GHCup:
-    0.1.16.2:
+    0.1.16.1:
      viTags:
      - Recommended
      - Latest
@@ -1461,23 +1461,23 @@ ghcupDownloads:
        A_64:
          Linux_UnknownLinux:
            unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-linux-ghcup-0.1.16.1
-              dlHash: d5e43b95ce1d42263376e414f7eb7c5dd440271c7c6cd9bad446fdeff3823893
+              dlHash: c3505d929722e245b22ec7a05267f1ae8e04089e139bbb470783eb9a1b648f83
          Darwin:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-apple-darwin-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-apple-darwin-ghcup-0.1.16.1
-              dlHash: a334620ccce7705211b2142882dde544003e6030af4b91a44c890542a90f879f
+              dlHash: 7edde6bb42323232d28495abbe630321d7eb8e3827e200438a9ae4c41e531e71
          FreeBSD:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-portbld-freebsd-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-portbld-freebsd-ghcup-0.1.16.1
-              dlHash: 92359592a5694375e53b22628920086bf4bbf0faff5be018a0ed3e745a6426a9
+              dlHash: 6b7fc3a52e859f186d30b04c823fd0c5997179222fe9aa510a33435f41599f5c
          Linux_Alpine:
            unknown_versioning: *ghcup-64
        A_32:
          Linux_UnknownLinux:
            unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/i386-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/i386-linux-ghcup-0.1.16.1
-              dlHash: 01968ca6decac7b6e8ba6e2c817870d3fa47289a6507e0c1ab563f7b6eec0e38
+              dlHash: 93ca5d77247b6ecac01be75e9ef5454adbb503b7957b8e9c59a5abd2046aef3c
          Linux_Alpine:
            unknown_versioning: *ghcup-32
  HLS:
--- a/ghcup-0.0.4.yaml
+++ b/ghcup-0.0.4.yaml
@@ -1868,7 +1868,7 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-armv7-linux-bootstrapped.tar.xz
              dlHash: 16c0d1eaba24bed14f3e152970179a45d9f9bb5cc839b2c210ad06eb7d4826ed
  GHCup:
-    0.1.16.2:
+    0.1.16.1:
      viTags:
      - Recommended
      - Latest
@@ -1878,39 +1878,39 @@ ghcupDownloads:
        A_64:
          Linux_UnknownLinux:
            unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-linux-ghcup-0.1.16.1
-              dlHash: d5e43b95ce1d42263376e414f7eb7c5dd440271c7c6cd9bad446fdeff3823893
+              dlHash: c3505d929722e245b22ec7a05267f1ae8e04089e139bbb470783eb9a1b648f83
          Darwin:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-apple-darwin-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-apple-darwin-ghcup-0.1.16.1
-              dlHash: a334620ccce7705211b2142882dde544003e6030af4b91a44c890542a90f879f
+              dlHash: 7edde6bb42323232d28495abbe630321d7eb8e3827e200438a9ae4c41e531e71
          FreeBSD:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-portbld-freebsd-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-portbld-freebsd-ghcup-0.1.16.1
-              dlHash: 92359592a5694375e53b22628920086bf4bbf0faff5be018a0ed3e745a6426a9
+              dlHash: 6b7fc3a52e859f186d30b04c823fd0c5997179222fe9aa510a33435f41599f5c
          Linux_Alpine:
            unknown_versioning: *ghcup-64
        A_32:
          Linux_UnknownLinux:
            unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/i386-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/i386-linux-ghcup-0.1.16.1
-              dlHash: 01968ca6decac7b6e8ba6e2c817870d3fa47289a6507e0c1ab563f7b6eec0e38
+              dlHash: 93ca5d77247b6ecac01be75e9ef5454adbb503b7957b8e9c59a5abd2046aef3c
          Linux_Alpine:
            unknown_versioning: *ghcup-32
        A_ARM64:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/aarch64-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/aarch64-linux-ghcup-0.1.16.1
-              dlHash: 0bdbfc724e0ddabb266156eea83c2c4e19c6ed79dd06db0c29b7d69df8d9fa8c
+              dlHash: 31fecbb704e9e2474804f42817ab17bfac28e32e5aeba93ae3f4c77fbc105706
          Darwin:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/aarch64-apple-darwin-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/aarch64-apple-darwin-ghcup-0.1.16.1
-              dlHash: 8854e991a2ba1350abda59dab96ce50ae7729d1ce99399d67929ef31e90f1da5
+              dlHash: 52eb69a5693abf6c18f95a3b9bf4dac59696299d690c6397bd22a9091e76d40e
        A_ARM:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/armv7-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/armv7-linux-ghcup-0.1.16.1
-              dlHash: 983ebb5b584bfa600704216a63f94b40d36a02573834e90ef1042c8472d9ad57
+              dlHash: 795dd2032f0f4e4ea9688cd49393aba4c40c9eae84c8dea3477f5f440f750767
  HLS:
    1.1.0:
      viTags:
--- a/ghcup-0.0.5.yaml
+++ b/ghcup-0.0.5.yaml
@@ -2025,7 +2025,7 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-armv7-linux-bootstrapped.tar.xz
              dlHash: 16c0d1eaba24bed14f3e152970179a45d9f9bb5cc839b2c210ad06eb7d4826ed
  GHCup:
-    0.1.16.2:
+    0.1.16.1:
      viTags:
      - Recommended
      - Latest
@@ -2035,43 +2035,43 @@ ghcupDownloads:
        A_64:
          Linux_UnknownLinux:
            unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-linux-ghcup-0.1.16.1
-              dlHash: d5e43b95ce1d42263376e414f7eb7c5dd440271c7c6cd9bad446fdeff3823893
+              dlHash: c3505d929722e245b22ec7a05267f1ae8e04089e139bbb470783eb9a1b648f83
          Darwin:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-apple-darwin-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-apple-darwin-ghcup-0.1.16.1
-              dlHash: a334620ccce7705211b2142882dde544003e6030af4b91a44c890542a90f879f
+              dlHash: 7edde6bb42323232d28495abbe630321d7eb8e3827e200438a9ae4c41e531e71
          FreeBSD:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-portbld-freebsd-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-portbld-freebsd-ghcup-0.1.16.1
-              dlHash: 92359592a5694375e53b22628920086bf4bbf0faff5be018a0ed3e745a6426a9
+              dlHash: 6b7fc3a52e859f186d30b04c823fd0c5997179222fe9aa510a33435f41599f5c
          Windows:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-mingw64-ghcup-0.1.16.2.exe
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-mingw64-ghcup-0.1.16.1.exe
-              dlHash: ec78872a84213968c490675127b9aad2285980b747c68207801ae824b98c7948
+              dlHash: 62439b45c7bcbc1395afe948393cb8e10bbe4f3af9b1fc58ac78660c2ad616d5
          Linux_Alpine:
            unknown_versioning: *ghcup-64
        A_32:
          Linux_UnknownLinux:
            unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/i386-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/i386-linux-ghcup-0.1.16.1
-              dlHash: 01968ca6decac7b6e8ba6e2c817870d3fa47289a6507e0c1ab563f7b6eec0e38
+              dlHash: 93ca5d77247b6ecac01be75e9ef5454adbb503b7957b8e9c59a5abd2046aef3c
          Linux_Alpine:
            unknown_versioning: *ghcup-32
        A_ARM64:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/aarch64-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/aarch64-linux-ghcup-0.1.16.1
-              dlHash: 0bdbfc724e0ddabb266156eea83c2c4e19c6ed79dd06db0c29b7d69df8d9fa8c
+              dlHash: 31fecbb704e9e2474804f42817ab17bfac28e32e5aeba93ae3f4c77fbc105706
          Darwin:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/aarch64-apple-darwin-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/aarch64-apple-darwin-ghcup-0.1.16.1
-              dlHash: 8854e991a2ba1350abda59dab96ce50ae7729d1ce99399d67929ef31e90f1da5
+              dlHash: 52eb69a5693abf6c18f95a3b9bf4dac59696299d690c6397bd22a9091e76d40e
        A_ARM:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/armv7-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/armv7-linux-ghcup-0.1.16.1
-              dlHash: 983ebb5b584bfa600704216a63f94b40d36a02573834e90ef1042c8472d9ad57
+              dlHash: 795dd2032f0f4e4ea9688cd49393aba4c40c9eae84c8dea3477f5f440f750767
  HLS:
    1.1.0:
      viTags: []
--- a/ghcup-0.0.6.yaml
+++ b/ghcup-0.0.6.yaml
@@ -19,18 +19,6 @@ toolRequirements:
          - libncurses5
          - libtinfo5
          notes: ''
        ">= 11":
          distroPKGs:
          - build-essential
          - curl
          - libffi-dev
          - libffi7
          - libgmp-dev
          - libgmp10
          - libncurses-dev
          - libncurses5
          - libtinfo5
          notes: ''
      Linux_Ubuntu:
        unknown_versioning:
          distroPKGs:
@@ -1590,6 +1578,7 @@ ghcupDownloads:
              dlHash: 0d18ef83593272f6196a41cc3abdc48dfe5e14372db75d71ea19fe35320c4e81
    8.10.5:
      viTags:
      - Recommended
      - base-4.14.2.0
      viChangeLog: https://downloads.haskell.org/~ghc/8.10.5/docs/html/users_guide/8.10.5-notes.html
      viSourceDL:
@@ -1688,107 +1677,6 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-armv7-deb10-linux.tar.xz
              dlSubdir: ghc-8.10.5
              dlHash: 56170d1a8450e18b7eb9c23c94723da352815b27ec250bb23742a62f16dcab6c
    8.10.6:
      viTags:
      - Recommended
      - base-4.14.3.0
      viChangeLog: https://downloads.haskell.org/~ghc/8.10.6/docs/html/users_guide/8.10.6-notes.html
      viSourceDL:
        dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-src.tar.xz
        dlSubdir: ghc-8.10.6
        dlHash: 43afba72a533408b42c1492bd047b5e37e5f7204e41a5cedd3182cc841610ce9
      viPostRemove: *ghc-post-remove
      viPreCompile: *ghc-pre-compile
      viArch:
        A_64:
          Linux_Debian:
            '( >= 9 && < 10 )': &ghc-8106-64-deb9
              dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-x86_64-deb9-linux.tar.xz
              dlSubdir: ghc-8.10.6
              dlHash: c14b631437ebc867f1fe1648579bc1dbe1a9b9ad31d7c801c3c77639523a83ae
            '( >= 10 && < 11 )': &ghc-8106-64-deb10
              dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-x86_64-deb10-linux.tar.xz
              dlSubdir: ghc-8.10.6
              dlHash: 95be925e310b8c419e1099d620a727a1ca2d8c918f33eb905a8221d7eb16467b
            unknown_versioning: *ghc-8106-64-deb9
          Linux_Ubuntu:
            unknown_versioning: &ghc-8106-64-fedora
              dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-x86_64-fedora27-linux.tar.xz
              dlSubdir: ghc-8.10.6
              dlHash: c452b84565cfc07c476694dd0fd389ed6d2b83619490b3c238f6bded438eddb1
            '( >= 16 && < 19 )': *ghc-8106-64-deb9
          Linux_Mint:
            unknown_versioning: *ghc-8106-64-deb10
          Linux_Fedora:
            '( >= 27 && < 28 )': *ghc-8106-64-fedora
            unknown_versioning: *ghc-8106-64-fedora
          Linux_CentOS:
            '( >= 7 && < 8 )': &ghc-8106-64-centos
              dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-x86_64-centos7-linux.tar.xz
              dlSubdir: ghc-8.10.6
              dlHash: 71bb69b7185cbb44a941f5214b241a55e158f69b103f10214a05de7845f77e45
            unknown_versioning: *ghc-8106-64-centos
          Linux_RedHat:
            unknown_versioning: *ghc-8106-64-centos
          Linux_Alpine:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-x86_64-alpine3.10-linux-integer-simple.tar.xz
              dlSubdir: ghc-8.10.6-x86_64-unknown-linux
              dlHash: f6c86909f665c9a01b9703450a500a5206a951ee43e6a0a227eebe1da0987d6a
          Linux_AmazonLinux:
            unknown_versioning: *ghc-8106-64-centos
          Linux_UnknownLinux:
            unknown_versioning: *ghc-8106-64-fedora
          Darwin:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-x86_64-apple-darwin.tar.xz
              dlSubdir: ghc-8.10.6
              dlHash: 32ab41da04d56cae2297d6e45caa88180f99cec0e33f2756cfbc48c0c60b5721
          FreeBSD:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-x86_64-unknown-freebsd.tar.xz
              dlSubdir: ghc-8.10.6
              dlHash: 268b9c0c55c70b0ebd7848c0e6c7f6c743b2f3082fb19f17b753c2536c354241
          Windows:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-x86_64-unknown-mingw32.tar.xz
              dlSubdir: ghc-8.10.6
              dlHash: ff62f4a245c2427a1a5e6f5f1c2ad7521f69f9274a27ffb17c76f252ca573f3b
        A_32:
          Linux_Debian:
            '( >= 9 && < 10 )': &ghc-8106-32-deb9
              dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-i386-deb9-linux.tar.xz
              dlSubdir: ghc-8.10.6
              dlHash: 31f934423d7971b462eaa53cf87b15265d11420578c5a8a04304348cb90f1c13
            unknown_versioning: *ghc-8106-32-deb9
          Linux_Ubuntu:
            unknown_versioning: *ghc-8106-32-deb9
          Linux_Mint:
            unknown_versioning: *ghc-8106-32-deb9
          Linux_UnknownLinux:
            unknown_versioning: *ghc-8106-32-deb9
          Linux_Alpine:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/8.10.6/ghc-8.10.6-i386-alpine-linux.tar.xz
              dlSubdir: ghc-8.10.6
              dlHash: f29974a67d76b64d0eb58603d60424c684a871e3107cebe45cf5b9b85f83b4c0
        A_ARM64:
          Linux_UnknownLinux:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-aarch64-deb10-linux.tar.xz
              dlSubdir: ghc-8.10.6
              dlHash: 1ea27a7776e3cbd0881ecf2eb03eb5176e2cef177a12271a1c33417f4fa48a59
          Darwin:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-aarch64-apple-darwin.tar.xz
              dlSubdir: ghc-8.10.6
              dlHash: 9e43fc3a39d2f2762262c63868653984e381e29eff6386f7325aad501b9190ad
        A_ARM:
          Linux_UnknownLinux:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-armv7-deb10-linux.tar.xz
              dlSubdir: ghc-8.10.6
              dlHash: d54de8306aa8b33afabf2ac94408e1f82c8e982a2a3346168c071b92bdb464c0
    9.0.1:
      viTags:
      - Latest
@@ -1884,81 +1772,96 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/~ghc/9.0.1/ghc-9.0.1-armv7-deb9-linux.tar.xz
              dlSubdir: ghc-9.0.1
              dlHash: 6f404f9b88468407b3a9ec5800bcc2d01dd453ef3d63414853b4fbbd4d8df496
-    9.2.0.20210821:
+    9.2.0.20210422:
      viTags:
      - Prerelease
      - base-4.16.0.0
-      viChangeLog: https://downloads.haskell.org/~ghc/9.2.1-rc1/docs/html/users_guide/index.html
+      viChangeLog: https://downloads.haskell.org/~ghc/9.2.1-alpha2/docs/html/users_guide/index.html
      viSourceDL:
-        dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-src.tar.xz
+        dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-src.tar.xz
-        dlSubdir: ghc-9.2.0.20210821
+        dlSubdir: ghc-9.2.0.20210422
-        dlHash: 7c4772d9a22a1774a13f67a570719c339f744b1607fbddfdf4702bb1fbbd57e0
+        dlHash: 69be189e6e7f8d51a9078ac8f177176bc5bff54edc8352974c50c1f0e110df27
      viPostRemove: *ghc-post-remove
      viArch:
        A_64:
          Linux_Debian:
-            '( >= 9 && < 10 )': &ghc-921-rc1-64-deb9
+            '( >= 9 && < 10 )': &ghc-921-alpha2-64-deb9
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-x86_64-deb9-linux.tar.xz
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-deb9-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210821
+              dlSubdir: ghc-9.2.0.20210422
-              dlHash: 4a561cb97f0cbe51de676d4e29968d49beb415a0190514d8f1a8f8ae0405f313
+              dlHash: 7262f3a230cd6945c588882e03941301877a9eb12e58c5975ad264596c2e12f2
-            '( >= 10 && < 11 )': &ghc-921-rc1-64-deb10
+            '( >= 10 && < 11 )': &ghc-921-alpha2-64-deb10
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-x86_64-deb10-linux.tar.xz
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-deb10-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210821
+              dlSubdir: ghc-9.2.0.20210422
-              dlHash: 28112271739b490635e7fd6ed1936949c3a3c41d4a7d95833bb47f420dd1a815
+              dlHash: 6d36cd08576bdee7473fee66b4b8ceb72011983a7d5aa3ec587403815a73e37b
-            unknown_versioning: *ghc-921-rc1-64-deb9
+            unknown_versioning: *ghc-921-alpha2-64-deb9
          Linux_Ubuntu:
-            unknown_versioning: &ghc-921-rc1-64-fedora
+            unknown_versioning: &ghc-921-alpha2-64-fedora
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-x86_64-fedora27-linux.tar.xz
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-fedora27-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210821
+              dlSubdir: ghc-9.2.0.20210422
-              dlHash: 3c4d3874e4438baf54bdf8bcbdca60a7416ca88c32da1823127dd3159bbede62
+              dlHash: 95624192ff0982690bc9093632d6351fdc6f72e6df380b392449229c39a0354b
-            '( >= 16 && < 19 )': *ghc-921-rc1-64-deb9
+            '( >= 16 && < 19 )': *ghc-921-alpha2-64-deb9
          Linux_Mint:
-            unknown_versioning: *ghc-921-rc1-64-deb10
+            unknown_versioning: *ghc-921-alpha2-64-deb10
          Linux_Fedora:
-            '( >= 27 && < 28 )': *ghc-921-rc1-64-fedora
+            '( >= 27 && < 28 )': *ghc-921-alpha2-64-fedora
-            unknown_versioning: *ghc-921-rc1-64-fedora
+            unknown_versioning: *ghc-921-alpha2-64-fedora
          Linux_CentOS:
            '( >= 7 && < 8 )': &ghc-921-alpha2-64-centos
              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-centos7-linux.tar.xz
              dlSubdir: ghc-9.2.0.20210422
              dlHash: dee4f158f2d59bfe97ec3f5773b6b31aa911f9b128a5e56eeefa2dccc754d295
            unknown_versioning: *ghc-921-alpha2-64-centos
          Linux_RedHat:
            unknown_versioning: *ghc-921-alpha2-64-centos
          Linux_Alpine:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-alpine3.10-linux-integer-simple.tar.xz
              dlSubdir: ghc-9.2.0.20210422-x86_64-unknown-linux
              dlHash: f61ae72925325ca7b316e40121e8d6bad94794016d3fa59bcbc8dbe116a7f13c
          Linux_AmazonLinux:
            unknown_versioning: *ghc-921-alpha2-64-centos
          Linux_UnknownLinux:
-            unknown_versioning: *ghc-921-rc1-64-fedora
+            unknown_versioning: *ghc-921-alpha2-64-fedora
          FreeBSD:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-x86_64-unknown-freebsd.tar.xz
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-unknown-freebsd.tar.xz
-              dlSubdir: ghc-9.2.0.20210821
+              dlSubdir: ghc-9.2.0.20210422
-              dlHash: ed31d0ca40588fcbed4f03e83e49abea7babb37e528bb36ab3c1fb6191c4c422
+              dlHash: 195728e02398ea6154fe713b7782a0cae856eb0d9d90f5d09cd0cca610c985e2
          Darwin:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-x86_64-apple-darwin.tar.xz
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-apple-darwin.tar.xz
-              dlSubdir: ghc-9.2.0.20210821-x86_64-apple-darwin
+              dlSubdir: ghc-9.2.0.20210422
-              dlHash: 38199ca35117cc1f4372a4b6692596f8639688c286d2a0d09bc7336826c05e10
+              dlHash: 8884c059f2b76e4c4309ff6bd7a7dde37663f751fd26220e9a2bcabb4d69a401
          Windows:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-x86_64-unknown-mingw32.tar.xz
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-unknown-mingw32.tar.xz
-              dlSubdir: ghc-9.2.0.20210821-x86_64-unknown-mingw32
+              dlSubdir: ghc-9.2.0.20210422-x86_64-unknown-mingw32
-              dlHash: 3926620698cb43b9e9a5381b4c3b7b84d22c67b3509a546581aa17afecd6a846
+              dlHash: 33f173b754d18f26bb27f52bb77a92fd22a48675daa2b43a1879bf01dddd7e8f
        A_32:
          Linux_Debian:
-            '( >= 9 && < 10 )': &ghc-921-rc1-32-deb9
+            '( >= 9 && < 10 )': &ghc-921-alpha2-32-deb9
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-i386-deb9-linux.tar.xz
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-i386-deb9-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210821
+              dlSubdir: ghc-9.2.0.20210422
-              dlHash: 30b25b787a787473988a785606b01099ce077f99d5c08940c0024537433f5084
+              dlHash: a378ec3fd31a9fa2a7134e98159e189362fe969f04031515616e9cc3182c861a
-            unknown_versioning: *ghc-921-rc1-32-deb9
+            unknown_versioning: *ghc-921-alpha2-32-deb9
          Linux_Ubuntu:
-            unknown_versioning: *ghc-921-rc1-32-deb9
+            unknown_versioning: *ghc-921-alpha2-32-deb9
          Linux_Mint:
-            unknown_versioning: *ghc-921-rc1-32-deb9
+            unknown_versioning: *ghc-921-alpha2-32-deb9
          Linux_UnknownLinux:
-            unknown_versioning: *ghc-921-rc1-32-deb9
+            unknown_versioning: *ghc-921-alpha2-32-deb9
        A_ARM64:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-aarch64-deb10-linux.tar.xz
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-aarch64-deb10-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210821
+              dlSubdir: ghc-9.2.0.20210422
-              dlHash: 289fc361be4a3199ac15449e30405a9831454811dd454e81eab73bfcdd2c4088
+              dlHash: fd2f4d0f6122f752aca396fe1a13e7d14d037dc45806bb0404a031eeeeb1994c
        A_ARM:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-armv7-deb10-linux.tar.xz
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-armv7-deb10-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210821
+              dlSubdir: ghc-9.2.0.20210422
-              dlHash: 9ff0be63191181700a1f51c453056c2dab16e11ecb7a4b1dd72e4b7aad5999a6
+              dlHash: dab7d7785d6ccafb130526b666669fc974ba5c90fc9aaf2024f9c65bcbd097d3
  Cabal:
    2.4.1.0:
      viTags:
@@ -2122,7 +2025,7 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-armv7-linux-bootstrapped.tar.xz
              dlHash: 16c0d1eaba24bed14f3e152970179a45d9f9bb5cc839b2c210ad06eb7d4826ed
  GHCup:
-    0.1.16.2:
+    0.1.16.1:
      viTags:
      - Recommended
      - Latest
@@ -2132,43 +2035,43 @@ ghcupDownloads:
        A_64:
          Linux_UnknownLinux:
            unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-linux-ghcup-0.1.16.1
-              dlHash: d5e43b95ce1d42263376e414f7eb7c5dd440271c7c6cd9bad446fdeff3823893
+              dlHash: c3505d929722e245b22ec7a05267f1ae8e04089e139bbb470783eb9a1b648f83
          Darwin:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-apple-darwin-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-apple-darwin-ghcup-0.1.16.1
-              dlHash: a334620ccce7705211b2142882dde544003e6030af4b91a44c890542a90f879f
+              dlHash: 7edde6bb42323232d28495abbe630321d7eb8e3827e200438a9ae4c41e531e71
          FreeBSD:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-portbld-freebsd-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-portbld-freebsd-ghcup-0.1.16.1
-              dlHash: 92359592a5694375e53b22628920086bf4bbf0faff5be018a0ed3e745a6426a9
+              dlHash: 6b7fc3a52e859f186d30b04c823fd0c5997179222fe9aa510a33435f41599f5c
          Windows:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-mingw64-ghcup-0.1.16.2.exe
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-mingw64-ghcup-0.1.16.1.exe
-              dlHash: ec78872a84213968c490675127b9aad2285980b747c68207801ae824b98c7948
+              dlHash: 62439b45c7bcbc1395afe948393cb8e10bbe4f3af9b1fc58ac78660c2ad616d5
          Linux_Alpine:
            unknown_versioning: *ghcup-64
        A_32:
          Linux_UnknownLinux:
            unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/i386-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/i386-linux-ghcup-0.1.16.1
-              dlHash: 01968ca6decac7b6e8ba6e2c817870d3fa47289a6507e0c1ab563f7b6eec0e38
+              dlHash: 93ca5d77247b6ecac01be75e9ef5454adbb503b7957b8e9c59a5abd2046aef3c
          Linux_Alpine:
            unknown_versioning: *ghcup-32
        A_ARM64:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/aarch64-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/aarch64-linux-ghcup-0.1.16.1
-              dlHash: 0bdbfc724e0ddabb266156eea83c2c4e19c6ed79dd06db0c29b7d69df8d9fa8c
+              dlHash: 31fecbb704e9e2474804f42817ab17bfac28e32e5aeba93ae3f4c77fbc105706
          Darwin:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/aarch64-apple-darwin-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/aarch64-apple-darwin-ghcup-0.1.16.1
-              dlHash: 8854e991a2ba1350abda59dab96ce50ae7729d1ce99399d67929ef31e90f1da5
+              dlHash: 52eb69a5693abf6c18f95a3b9bf4dac59696299d690c6397bd22a9091e76d40e
        A_ARM:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.2/armv7-linux-ghcup-0.1.16.2
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.16.1/armv7-linux-ghcup-0.1.16.1
-              dlHash: 983ebb5b584bfa600704216a63f94b40d36a02573834e90ef1042c8472d9ad57
+              dlHash: 795dd2032f0f4e4ea9688cd49393aba4c40c9eae84c8dea3477f5f440f750767
  HLS:
    1.1.0:
      viTags: []
@@ -2303,8 +2206,7 @@ ghcupDownloads:
            unknown_versioning: *stack-271-64
    2.7.3:
      viTags:
-        - Latest
+        - old
        - Recommended
      viChangeLog: https://github.com/commercialhaskell/stack/blob/master/ChangeLog.md#v273
      viPostInstall: *stack-post
      viArch:
@@ -2329,4 +2231,65 @@ ghcupDownloads:
                RegexDir: "stack-.*"
          Linux_Alpine:
            unknown_versioning: *stack-273-64
    2.7.3.1:
      viTags:
        - Latest
        - Recommended
      viChangeLog: https://github.com/commercialhaskell/stack/blob/master/ChangeLog.md#v273
      viPostInstall: &stack-post-new |
        Stack manages GHC versions internally by default. It can also use hooks to automatically
        install and locate GHC versions utilizing GHCup:
          https://gitlab.haskell.org/haskell/ghcup-hs#stack-hooks
        Alternatively, you can also tell stack to use the system GHC version (whatever is in PATH):
          stack config set system-ghc  true  --global
        If you want stack to use GHCup's provided MSys2, follow the instructions here (not recommended):
          https://gitlab.haskell.org/haskell/ghcup-hs/-/tree/stack-fork#sharing-msys2-between-stack-and-ghcup
        Also check out: https://docs.haskellstack.org/en/stable/yaml_configuration
        !!! GHCup ships a patched version of stack. Before reporting bugs to stack developers !!!
        !!! make sure it is reproducible with the original stack version:                     !!!
        !!!   https://docs.haskellstack.org/en/stable/install_and_upgrade/                    !!!
      viArch:
        A_64:
          Linux_UnknownLinux:
            unknown_versioning: &stack-2731-64
              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/stack/2.7.3.1/stack-2.7.3.1-linux-x86_64.tar.gz
              dlSubdir:
                RegexDir: "stack-.*"
              dlHash: 7c10090d568651208b6d6c003c8d78ef79099f4b472aea5ca800f3e4a7a1c6ce
          Darwin:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/stack/2.7.3.1/stack-2.7.3.1-osx-x86_64.tar.gz
              dlSubdir:
                RegexDir: "stack-.*"
              dlHash: 23030868be377d62ed324332d239ddd915b12f7a64c887f297e1b60a3f65894f
          Windows:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/stack/2.7.3.1/stack-2.7.3.1-windows-x86_64.tar.bz2
              dlHash: 983ac24219370cdf220f47f9edb17d0aeb831a1253fd777d322fd1bff358c511
          Linux_Alpine:
            unknown_versioning: *stack-2731-64
          FreeBSD:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/stack/2.7.3.1/stack-2.7.3.1-freebsd-x86_64.tar.gz
              dlHash: b6b1eb59981b8c1d3a04b061f03296b1540ecbadbc34cbd4fe712a575a155ee9
        A_32:
          Linux_UnknownLinux:
            unknown_versioning: &stack-2731-32
              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/stack/2.7.3.1/stack-2.7.3.1-linux-i386.tar.gz
              dlHash: da2081d84517d16a8216e929582dd39caa19643c819b77c6f68f138bd177a758
          Linux_Alpine:
            unknown_versioning: *stack-2731-32
        A_ARM64:
          Linux_UnknownLinux:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/stack/2.7.3.1/stack-2.7.3.1-linux-aarch64.tar.gz
              dlHash: 0e1789852a476dd87f495fa0b481309398b2bafc00cf7c8d980c91977b39d9a6
        A_ARM:
          Linux_UnknownLinux:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/stack/2.7.3.1/stack-2.7.3.1-linux-armv7.tar.gz
              dlHash: 13d61616c169615d80381ea0c84e13540410b736a553565cd48d10b4d2bd7f23
--- a/ghcup-0.0.7.yaml
+++ b/ghcup-0.0.7.yaml
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -1,6 +1,6 @@
 cabal-version:   3.0
 name:            ghcup
-version:         0.1.16.2
+version:         0.1.16.1
 license:         LGPL-3.0-only
 license-file:    LICENSE
 copyright:       Julian Ospald 2020
@@ -21,7 +21,6 @@ extra-doc-files:
  ghcup-0.0.4.yaml
  ghcup-0.0.5.yaml
  ghcup-0.0.6.yaml
  ghcup-0.0.7.yaml
  HACKING.md
  README.md
  RELEASING.md
@@ -44,6 +43,11 @@ flag internal-downloader
  default:     False
  manual:      True
 flag tar
  description: Use tar-bytestring instead of libarchive.
  default:     False
  manual:      True
 library
  exposed-modules:
    GHCup
@@ -106,15 +110,17 @@ library
    , disk-free-space       ^>=0.1.0.1
    , extra                 ^>=1.7.9
    , filepath              ^>=1.4.2.1
    , generics-sop          ^>=0.5
    , haskus-utils-types    ^>=1.5
    , haskus-utils-variant  >=3.0        && <3.2
    , libarchive            ^>=3.0.0.0
    , lzma-static           ^>=5.2.5.3
    , megaparsec            >=8.0.0      && <9.1
    , monad-logger          ^>=0.3.31
    , mtl                   ^>=2.2
    , optics                ^>=0.4
    , optics-vl             ^>=0.2
    , os-release            ^>=1.0.0
    , parsec                ^>=3.1
    , pretty                ^>=1.1.3.1
    , pretty-terminal       ^>=0.1.0.0
    , regex-posix           ^>=0.96
@@ -123,6 +129,7 @@ library
    , safe-exceptions       ^>=0.1
    , split                 ^>=0.2.3.4
    , strict-base           ^>=0.4
    , string-interpolate    >=0.2.0.0    && <0.4
    , template-haskell      >=2.7        && <2.18
    , temporary             ^>=1.3
    , text                  ^>=1.2.4.0
@@ -131,6 +138,7 @@ library
    , unliftio-core         ^>=0.2.0.1
    , unordered-containers  ^>=0.2.10.0
    , uri-bytestring        ^>=0.3.2.2
    , utf8-string           ^>=1.0
    , vector                ^>=0.12
    , versions              >=4.0.1      && <5.1
    , word8                 ^>=0.1.3
@@ -147,6 +155,13 @@ library
      , io-streams             >=1.5.2.1
      , terminal-progress-bar  >=0.4.1
  if flag(tar)
    cpp-options:   -DTAR
    build-depends: tar
  else
    build-depends: libarchive ^>=3.0.0.0
  if os(windows)
    cpp-options:   -DIS_WINDOWS
    other-modules: GHCup.Utils.File.Windows
@@ -160,6 +175,8 @@ library
    other-modules: GHCup.Utils.File.Posix
    build-depends:
      , bz2              >=0.5.0.5 && <1.1
      , hpath-posix      ^>=0.13.3
      , process          ^>=1.6.9
      , unix             ^>=2.7
      , unix-bytestring  ^>=0.3.7.3
@@ -194,7 +211,6 @@ executable ghcup
    , filepath              ^>=1.4.2.1
    , ghcup
    , haskus-utils-variant  >=3.0      && <3.2
    , libarchive            ^>=3.0.0.0
    , megaparsec            >=8.0.0    && <9.1
    , monad-logger          ^>=0.3.31
    , mtl                   ^>=2.2
@@ -204,12 +220,12 @@ executable ghcup
    , resourcet             ^>=1.2.2
    , safe                  ^>=0.3.18
    , safe-exceptions       ^>=0.1
    , string-interpolate    >=0.2.0.0  && <0.4
    , template-haskell      >=2.7      && <2.18
    , text                  ^>=1.2.4.0
    , uri-bytestring        ^>=0.3.2.2
    , utf8-string           ^>=1.0
    , versions              >=4.0.1    && <5.1
    , yaml                  ^>=0.11.4.0
  if flag(internal-downloader)
    cpp-options: -DINTERNAL_DOWNLOADER
@@ -218,7 +234,7 @@ executable ghcup
    cpp-options:   -DBRICK
    other-modules: BrickMain
    build-depends:
-      , brick         ^>=0.64
+      , brick         >=0.5    && <0.64
      , transformers  ^>=0.5
      , vector        ^>=0.12
      , vty           >=5.28.2 && <5.34
@@ -226,6 +242,12 @@ executable ghcup
  if os(windows)
    cpp-options: -DIS_WINDOWS
  if flag(tar)
    cpp-options: -DTAR
  else
    build-depends: libarchive ^>=3.0.0.0
 executable ghcup-gen
  main-is:            Main.hs
  hs-source-dirs:     app/ghcup-gen
@@ -257,7 +279,6 @@ executable ghcup-gen
    , filepath              ^>=1.4.2.1
    , ghcup
    , haskus-utils-variant  >=3.0      && <3.2
    , libarchive            ^>=3.0.0.0
    , monad-logger          ^>=0.3.31
    , mtl                   ^>=2.2
    , optics                ^>=0.4
@@ -267,11 +288,20 @@ executable ghcup-gen
    , regex-posix           ^>=0.96
    , resourcet             ^>=1.2.2
    , safe-exceptions       ^>=0.1
    , string-interpolate    >=0.2.0.0  && <0.4
    , text                  ^>=1.2.4.0
    , transformers          ^>=0.5
    , uri-bytestring        ^>=0.3.2.2
    , versions              >=4.0.1    && <5.1
    , yaml                  ^>=0.11.4.0
  if flag(tar)
    cpp-options:   -DTAR
    build-depends: tar
  else
    build-depends: libarchive ^>=3.0.0.0
 test-suite ghcup-test
  type:               exitcode-stdio-1.0
  main-is:            Main.hs
--- a/hooks/stack/ghc-install.sh
+++ b/hooks/stack/ghc-install.sh
@@ -0,0 +1,23 @@
 #!/bin/sh
 set -eu
 case $HOOK_GHC_TYPE in
 	bindist)
 		ghcup --offline whereis ghc $HOOK_GHC_VERSION || {
 			ghcup --cache install ghc $HOOK_GHC_VERSION && ghcup whereis ghc $HOOK_GHC_VERSION
 		}
 		;;
 	git)
 		>&2 echo "Hook doesn't support installing from source."
 		>&2 echo "Consider enabling stack GHC installs for this project, via:"
 		>&2 echo "    stack config set install-ghc true"
 		exit 1
 		;;
 	*)
 		>&2 echo "Unsupported GHC installation type: ${HOOK_GHC_TYPE}."
 		>&2 echo "Consider enabling stack GHC installs for this project, via:"
 		>&2 echo "    stack config set install-ghc true"
 		exit 2
 		;;
 esac
--- a/lib/GHCup.hs
+++ b/lib/GHCup.hs
@@ -39,7 +39,9 @@ import           GHCup.Utils.String.QQ
 import           GHCup.Utils.Version.QQ
 import           GHCup.Version
 #if !defined(TAR)
 import           Codec.Archive                  ( ArchiveResult )
 #endif
 import           Control.Applicative
 import           Control.DeepSeq                ( force )
 import           Control.Exception              ( evaluate )
@@ -61,6 +63,7 @@ import           Data.List
 import           Data.List.Extra
 import           Data.Maybe
 import           Data.String                    ( fromString )
 import           Data.String.Interpolate
 import           Data.Text                      ( Text )
 import           Data.Time.Clock
 import           Data.Time.Format.ISO8601
@@ -89,7 +92,6 @@ import qualified Data.ByteString               as B
 import qualified Data.ByteString.Lazy          as BL
 import qualified Data.Map.Strict               as Map
 import qualified Data.Text                     as T
 import qualified Data.Text.IO                  as T
 import qualified Data.Text.Encoding            as E
 #if defined(IS_WINDOWS)
 import qualified System.Win32.File             as Win32
@@ -184,7 +186,6 @@ installGHCBindist :: ( MonadFail m
                     )
                  => DownloadInfo    -- ^ where/how to download
                  -> Version         -- ^ the version to install
                  -> Maybe FilePath  -- ^ isolated filepath if user passed any
                  -> Excepts
                       '[ AlreadyInstalled
                        , BuildFailed
@@ -194,20 +195,16 @@ installGHCBindist :: ( MonadFail m
                        , NotInstalled
                        , UnknownArchive
                        , TarDirDoesNotExist
-                        , DirNotEmpty
+#if !defined(TAR)
                        , ArchiveResult
 #endif
                        ]
                       m
                       ()
-installGHCBindist dlinfo ver isoFilepath = do
+installGHCBindist dlinfo ver = do
  let tver = mkTVer ver
-
+  lift $ $(logDebug) [i|Requested to install GHC with #{ver}|]
-  lift $ $(logDebug) $ "Requested to install GHC with " <> prettyVer ver
+  whenM (lift $ ghcInstalled tver) (throwE $ AlreadyInstalled GHC ver)
  case isoFilepath of
    -- we only care for already installed errors in regular (non-isolated) installs
    Nothing -> whenM (lift $ ghcInstalled tver) (throwE $ AlreadyInstalled GHC ver)
    _ -> pure ()
  -- download (or use cached version)
  dl <- liftE $ downloadCached dlinfo Nothing
@@ -217,15 +214,9 @@ installGHCBindist dlinfo ver isoFilepath = do
  toolchainSanityChecks
-  case isoFilepath of
+  liftE $ installPackedGHC dl (view dlSubdir dlinfo) ghcdir ver
    Just isoDir -> do                        -- isolated install
      lift $ $(logInfo) $ "isolated installing GHC to " <> T.pack isoDir
      liftE $ installPackedGHC dl (view dlSubdir dlinfo) isoDir ver
    Nothing -> do                            -- regular install
      liftE $ installPackedGHC dl (view dlSubdir dlinfo) ghcdir ver
-      -- make symlinks & stuff when regular install,
+  liftE $ postGHCInstall tver
      liftE $ postGHCInstall tver
 where
  toolchainSanityChecks = do
@@ -259,18 +250,17 @@ installPackedGHC :: ( MonadMask m
                      '[ BuildFailed
                       , UnknownArchive
                       , TarDirDoesNotExist
-                       , DirNotEmpty
+#if !defined(TAR)
                       , ArchiveResult
 #endif
                       ] m ()
 installPackedGHC dl msubdir inst ver = do
  PlatformRequest {..} <- lift getPlatformReq
  liftE $ installDestSanityCheck inst
  -- unpack
  tmpUnpack <- lift mkGhcupTmpDir
  liftE $ unpackToDir tmpUnpack dl
-  liftE $ catchWarn $ lEM @_ @'[ProcessError] $ darwinNotarization _rPlatform tmpUnpack
+  void $ lift $ darwinNotarization _rPlatform tmpUnpack
  -- the subdir of the archive where we do the work
  workdir <- maybe (pure tmpUnpack)
@@ -280,22 +270,6 @@ installPackedGHC dl msubdir inst ver = do
  liftE $ runBuildAction tmpUnpack
                         (Just inst)
                         (installUnpackedGHC workdir inst ver)
 where
  -- | Does basic checks for isolated installs
  -- Isolated Directory:
  --   1. if it doesn't exist -> proceed
  --   2. if it exists and is empty -> proceed
  --   3. if it exists and is non-empty -> panic and leave the house
  installDestSanityCheck :: ( MonadIO m
                            , MonadCatch m
                            ) =>
                            FilePath ->
                            Excepts '[DirNotEmpty] m ()
  installDestSanityCheck isoDir = do
    hideErrorDef [doesNotExistErrorType] () $ do
      contents <- liftIO $ getDirectoryContentsRecursive isoDir
      unless (null contents) (throwE $ DirNotEmpty isoDir)
 -- | Install an unpacked GHC distribution. This only deals with the GHC
@@ -326,6 +300,10 @@ installUnpackedGHC path inst ver = do
    setModificationTime dest mtime
 #else
  PlatformRequest {..} <- lift getPlatformReq
  liftIO $ copyDirectoryRecursive path inst $ \source dest -> do
    mtime <- getModificationTime source
    copyFile source dest
    setModificationTime dest mtime
  let alpineArgs
       | ver >= [vver|8.2.2|], Linux Alpine <- _rPlatform
@@ -365,7 +343,6 @@ installGHCBin :: ( MonadFail m
                 , MonadUnliftIO m
                 )
              => Version         -- ^ the version to install
              -> Maybe FilePath  -- ^ isolated install filepath, if user passed any
              -> Excepts
                   '[ AlreadyInstalled
                    , BuildFailed
@@ -375,14 +352,15 @@ installGHCBin :: ( MonadFail m
                    , NotInstalled
                    , UnknownArchive
                    , TarDirDoesNotExist
-                    , DirNotEmpty
+#if !defined(TAR)
                    , ArchiveResult
 #endif
                    ]
                   m
                   ()
-installGHCBin ver isoFilepath = do
+installGHCBin ver = do
  dlinfo <- liftE $ getDownloadInfo GHC ver
-  installGHCBindist dlinfo ver isoFilepath
+  installGHCBindist dlinfo ver
 -- | Like 'installCabalBin', except takes the 'DownloadInfo' as
@@ -401,7 +379,6 @@ installCabalBindist :: ( MonadMask m
                       )
                    => DownloadInfo
                    -> Version
                    -> Maybe FilePath -- ^ isolated install filepath, if user provides any.
                    -> Excepts
                         '[ AlreadyInstalled
                          , CopyError
@@ -411,29 +388,26 @@ installCabalBindist :: ( MonadMask m
                          , NotInstalled
                          , UnknownArchive
                          , TarDirDoesNotExist
 #if !defined(TAR)
                          , ArchiveResult
-                          , FileAlreadyExistsError
+#endif
                          ]
                         m
                         ()
-installCabalBindist dlinfo ver isoFilepath = do
+installCabalBindist dlinfo ver = do
-  lift $ $(logDebug) $ "Requested to install cabal version " <> prettyVer ver
+  lift $ $(logDebug) [i|Requested to install cabal version #{ver}|]
  PlatformRequest {..} <- lift getPlatformReq
  Dirs {..} <- lift getDirs
-  case isoFilepath of
+  whenM
-    Nothing -> -- for regular install check if any previous versions installed
+      (lift (cabalInstalled ver) >>= \a -> liftIO $
-      whenM
+        handleIO (\_ -> pure False)
-        (lift (cabalInstalled ver) >>= \a -> liftIO $
+          $ fmap (\x -> a && x)
-          handleIO (\_ -> pure False)
+          -- ignore when the installation is a legacy cabal (binary, not symlink)
-            $ fmap (\x -> a && x)
+          $ pathIsLink (binDir </> "cabal" <> exeExt)
-            -- ignore when the installation is a legacy cabal (binary, not symlink)
+      )
-            $ pathIsLink (binDir </> "cabal" <> exeExt)
+      (throwE $ AlreadyInstalled Cabal ver)
        )
        (throwE $ AlreadyInstalled Cabal ver)
    _ -> pure () -- check isn't required in isolated installs
  -- download (or use cached version)
  dl <- liftE $ downloadCached dlinfo Nothing
@@ -441,42 +415,35 @@ installCabalBindist dlinfo ver isoFilepath = do
  -- unpack
  tmpUnpack <- lift withGHCupTmpDir
  liftE $ unpackToDir tmpUnpack dl
-  liftE $ catchWarn $ lEM @_ @'[ProcessError] $ darwinNotarization _rPlatform tmpUnpack
+  void $ lift $ darwinNotarization _rPlatform tmpUnpack
  -- the subdir of the archive where we do the work
  workdir <- maybe (pure tmpUnpack) (liftE . intoSubdir tmpUnpack) (view dlSubdir dlinfo)
-  case isoFilepath of
+  liftE $ installCabal' workdir binDir
    Just isoDir -> do             -- isolated install
      lift $ $(logInfo) $ "isolated installing Cabal to " <> T.pack isoDir
      liftE $ installCabalUnpacked workdir isoDir Nothing
-    Nothing -> do                 -- regular install
+  -- create symlink if this is the latest version
-      liftE $ installCabalUnpacked workdir binDir (Just ver)
+  cVers <- lift $ fmap rights getInstalledCabals
  let lInstCabal = headMay . reverse . sort $ cVers
  when (maybe True (ver >=) lInstCabal) $ liftE $ setCabal ver
-      -- create symlink if this is the latest version for regular installs
+ where
-      cVers <- lift $ fmap rights getInstalledCabals
+  -- | Install an unpacked cabal distribution.
-      let lInstCabal = headMay . reverse . sort $ cVers
+  installCabal' :: (MonadLogger m, MonadCatch m, MonadIO m)
-      when (maybe True (ver >=) lInstCabal) $ liftE $ setCabal ver
+                => FilePath      -- ^ Path to the unpacked cabal bindist (where the executable resides)
                -> FilePath      -- ^ Path to install to
                -> Excepts '[CopyError] m ()
  installCabal' path inst = do
    lift $ $(logInfo) "Installing cabal"
    let cabalFile = "cabal"
    liftIO $ createDirRecursive' inst
    let destFileName = cabalFile <> "-" <> T.unpack (prettyVer ver) <> exeExt
    let destPath = inst </> destFileName
    handleIO (throwE . CopyError . show) $ liftIO $ copyFile
      (path </> cabalFile <> exeExt)
      destPath
    lift $ chmod_755 destPath
 -- | Install an unpacked cabal distribution.
 installCabalUnpacked :: (MonadLogger m, MonadCatch m, MonadIO m)
              => FilePath      -- ^ Path to the unpacked cabal bindist (where the executable resides)
              -> FilePath      -- ^ Path to install to
              -> Maybe Version -- ^ Nothing for isolated install
              -> Excepts '[CopyError, FileAlreadyExistsError] m ()
 installCabalUnpacked path inst mver' = do
  lift $ $(logInfo) "Installing cabal"
  let cabalFile = "cabal"
  liftIO $ createDirRecursive' inst
  let destFileName = cabalFile
        <> maybe "" (("-" <>) . T.unpack . prettyVer) mver'
        <> exeExt
  let destPath = inst </> destFileName
  handleIO (throwE . CopyError . show) $ liftIO $ copyFile
    (path </> cabalFile <> exeExt)
    destPath
  lift $ chmod_755 destPath
 -- | Installs cabal into @~\/.ghcup\/bin/cabal-\<ver\>@ and
 -- creates a default @cabal -> cabal-x.y.z.q@ symlink for
@@ -495,7 +462,6 @@ installCabalBin :: ( MonadMask m
                   , MonadFail m
                   )
                => Version
                -> Maybe FilePath -- isolated install Path, if user provided any
                -> Excepts
                     '[ AlreadyInstalled
                      , CopyError
@@ -505,14 +471,15 @@ installCabalBin :: ( MonadMask m
                      , NotInstalled
                      , UnknownArchive
                      , TarDirDoesNotExist
 #if !defined(TAR)
                      , ArchiveResult
-                      , FileAlreadyExistsError
+#endif
                      ]
                     m
                     ()
-installCabalBin ver isoFilepath = do
+installCabalBin ver = do
  dlinfo <- liftE $ getDownloadInfo Cabal ver
-  installCabalBindist dlinfo ver isoFilepath
+  installCabalBindist dlinfo ver
 -- | Like 'installHLSBin, except takes the 'DownloadInfo' as
@@ -531,7 +498,6 @@ installHLSBindist :: ( MonadMask m
                     )
                  => DownloadInfo
                  -> Version
                  -> Maybe FilePath -- ^ isolated install path, if user passed any
                  -> Excepts
                       '[ AlreadyInstalled
                        , CopyError
@@ -541,23 +507,20 @@ installHLSBindist :: ( MonadMask m
                        , NotInstalled
                        , UnknownArchive
                        , TarDirDoesNotExist
 #if !defined(TAR)
                        , ArchiveResult
 #endif
                        ]
                       m
                       ()
-installHLSBindist dlinfo ver isoFilepath = do
+installHLSBindist dlinfo ver = do
-  lift $ $(logDebug) $ "Requested to install hls version " <> prettyVer ver
+  lift $ $(logDebug) [i|Requested to install hls version #{ver}|]
  PlatformRequest {..} <- lift getPlatformReq
  Dirs {..} <- lift getDirs
-  case isoFilepath of
+  whenM (lift (hlsInstalled ver))
-    Nothing ->
+    (throwE $ AlreadyInstalled HLS ver)
      -- we only check for already installed in regular (non-isolated) installs
      whenM (lift (hlsInstalled ver))
      (throwE $ AlreadyInstalled HLS ver)
    _ -> pure ()
  -- download (or use cached version)
  dl <- liftE $ downloadCached dlinfo Nothing
@@ -565,60 +528,51 @@ installHLSBindist dlinfo ver isoFilepath = do
  -- unpack
  tmpUnpack <- lift withGHCupTmpDir
  liftE $ unpackToDir tmpUnpack dl
-  liftE $ catchWarn $ lEM @_ @'[ProcessError] $ darwinNotarization _rPlatform tmpUnpack
+  void $ lift $ darwinNotarization _rPlatform tmpUnpack
  -- the subdir of the archive where we do the work
  workdir <- maybe (pure tmpUnpack) (liftE . intoSubdir tmpUnpack) (view dlSubdir dlinfo)
-  case isoFilepath of
+  liftE $ installHLS' workdir binDir
    Just isoDir -> do
      lift $ $(logInfo) $ "isolated installing HLS to " <> T.pack isoDir
      liftE $ installHLSUnpacked workdir isoDir Nothing
-    Nothing -> do
+  -- create symlink if this is the latest version
-      liftE $ installHLSUnpacked workdir binDir (Just ver)
+  hlsVers <- lift $ fmap rights getInstalledHLSs
  let lInstHLS = headMay . reverse . sort $ hlsVers
  when (maybe True (ver >=) lInstHLS) $ liftE $ setHLS ver
-      -- create symlink if this is the latest version in a regular install
+ where
-      hlsVers <- lift $ fmap rights getInstalledHLSs
+  -- | Install an unpacked hls distribution.
-      let lInstHLS = headMay . reverse . sort $ hlsVers
+  installHLS' :: (MonadFail m, MonadLogger m, MonadCatch m, MonadIO m)
-      when (maybe True (ver >=) lInstHLS) $ liftE $ setHLS ver
+                => FilePath      -- ^ Path to the unpacked hls bindist (where the executable resides)
                -> FilePath      -- ^ Path to install to
                -> Excepts '[CopyError] m ()
  installHLS' path inst = do
    lift $ $(logInfo) "Installing HLS"
    liftIO $ createDirRecursive' inst
    -- install haskell-language-server-<ghcver>
    bins@(_:_) <- liftIO $ findFiles
      path
      (makeRegexOpts compExtended
                     execBlank
                     ([s|^haskell-language-server-[0-9].*$|] :: ByteString)
      )
    forM_ bins $ \f -> do
      let toF = dropSuffix exeExt f
                <> "~" <> T.unpack (prettyVer ver) <> exeExt
      handleIO (throwE . CopyError . show) $ liftIO $ copyFile
        (path </> f)
        (inst </> toF)
      lift $ chmod_755 (inst </> toF)
-- | Install an unpacked hls distribution.
+    -- install haskell-language-server-wrapper
-installHLSUnpacked :: (MonadFail m, MonadLogger m, MonadCatch m, MonadIO m)
+    let wrapper = "haskell-language-server-wrapper"
-              => FilePath      -- ^ Path to the unpacked hls bindist (where the executable resides)
+        toF = wrapper <> "-" <> T.unpack (prettyVer ver) <> exeExt
              -> FilePath      -- ^ Path to install to
              -> Maybe Version -- ^ Nothing for isolated install
              -> Excepts '[CopyError] m ()
 installHLSUnpacked path inst mver' = do
  lift $ $(logInfo) "Installing HLS"
  liftIO $ createDirRecursive' inst
  -- install haskell-language-server-<ghcver>
  bins@(_:_) <- liftIO $ findFiles
    path
    (makeRegexOpts compExtended
                   execBlank
                   ([s|^haskell-language-server-[0-9].*$|] :: ByteString)
    )
  forM_ bins $ \f -> do
    let toF = dropSuffix exeExt f
              <> maybe "" (("~" <>) . T.unpack . prettyVer) mver'
              <> exeExt
    handleIO (throwE . CopyError . show) $ liftIO $ copyFile
-      (path </> f)
+      (path </> wrapper <> exeExt)
      (inst </> toF)
    lift $ chmod_755 (inst </> toF)
  -- install haskell-language-server-wrapper
  let wrapper = "haskell-language-server-wrapper"
      toF = wrapper
            <> maybe "" (("-" <>) . T.unpack . prettyVer) mver'
            <> exeExt
  handleIO (throwE . CopyError . show) $ liftIO $ copyFile
    (path </> wrapper <> exeExt)
    (inst </> toF)
  lift $ chmod_755 (inst </> toF)
 -- | Installs hls binaries @haskell-language-server-\<ghcver\>@
 -- into @~\/.ghcup\/bin/@, as well as @haskell-languager-server-wrapper@.
@@ -636,7 +590,6 @@ installHLSBin :: ( MonadMask m
                 , MonadFail m
                 )
              => Version
              -> Maybe FilePath
              -> Excepts
                   '[ AlreadyInstalled
                    , CopyError
@@ -646,13 +599,15 @@ installHLSBin :: ( MonadMask m
                    , NotInstalled
                    , UnknownArchive
                    , TarDirDoesNotExist
 #if !defined(TAR)
                    , ArchiveResult
 #endif
                    ]
                   m
                   ()
-installHLSBin ver isoFilepath = do
+installHLSBin ver = do
  dlinfo <- liftE $ getDownloadInfo HLS ver
-  installHLSBindist dlinfo ver isoFilepath
+  installHLSBindist dlinfo ver
 -- | Installs stack into @~\/.ghcup\/bin/stack-\<ver\>@ and
@@ -672,7 +627,6 @@ installStackBin :: ( MonadMask m
                   , MonadFail m
                   )
                => Version
                -> Maybe FilePath
                -> Excepts
                     '[ AlreadyInstalled
                      , CopyError
@@ -682,13 +636,15 @@ installStackBin :: ( MonadMask m
                      , NotInstalled
                      , UnknownArchive
                      , TarDirDoesNotExist
 #if !defined(TAR)
                      , ArchiveResult
 #endif
                      ]
                     m
                     ()
-installStackBin ver isoFilepath = do
+installStackBin ver = do
  dlinfo <- liftE $ getDownloadInfo Stack ver
-  installStackBindist dlinfo ver isoFilepath
+  installStackBindist dlinfo ver
 -- | Like 'installStackBin', except takes the 'DownloadInfo' as
@@ -707,7 +663,6 @@ installStackBindist :: ( MonadMask m
                       )
                    => DownloadInfo
                    -> Version
                    -> Maybe FilePath
                    -> Excepts
                         '[ AlreadyInstalled
                          , CopyError
@@ -717,22 +672,20 @@ installStackBindist :: ( MonadMask m
                          , NotInstalled
                          , UnknownArchive
                          , TarDirDoesNotExist
 #if !defined(TAR)
                          , ArchiveResult
 #endif
                          ]
                         m
                         ()
-installStackBindist dlinfo ver isoFilepath = do
+installStackBindist dlinfo ver = do
-  lift $ $(logDebug) $ "Requested to install stack version " <> prettyVer ver
+  lift $ $(logDebug) [i|Requested to install stack version #{ver}|]
  PlatformRequest {..} <- lift getPlatformReq
  Dirs {..} <- lift getDirs
-  case isoFilepath of
+  whenM (lift (stackInstalled ver))
-    Nothing ->             -- check previous versions in case of regular installs
+    (throwE $ AlreadyInstalled Stack ver)
      whenM (lift (stackInstalled ver))
      (throwE $ AlreadyInstalled Stack ver)
    _ -> pure ()           -- don't do shit for isolates
  -- download (or use cached version)
  dl <- liftE $ downloadCached dlinfo Nothing
@@ -740,42 +693,36 @@ installStackBindist dlinfo ver isoFilepath = do
  -- unpack
  tmpUnpack <- lift withGHCupTmpDir
  liftE $ unpackToDir tmpUnpack dl
-  liftE $ catchWarn $ lEM @_ @'[ProcessError] $ darwinNotarization _rPlatform tmpUnpack
+  void $ lift $ darwinNotarization _rPlatform tmpUnpack
  -- the subdir of the archive where we do the work
  workdir <- maybe (pure tmpUnpack) (liftE . intoSubdir tmpUnpack) (view dlSubdir dlinfo)
-  case isoFilepath of
+  liftE $ installStack' workdir binDir
    Just isoDir -> do                 -- isolated install
      lift $ $(logInfo) $ "isolated installing Stack to " <> T.pack isoDir
      liftE $ installStackUnpacked workdir isoDir Nothing
    Nothing -> do                     -- regular install
      liftE $ installStackUnpacked workdir binDir (Just ver)
-      -- create symlink if this is the latest version and a regular install
+  -- create symlink if this is the latest version
-      sVers <- lift $ fmap rights getInstalledStacks
+  sVers <- lift $ fmap rights getInstalledStacks
-      let lInstStack = headMay . reverse . sort $ sVers
+  let lInstStack = headMay . reverse . sort $ sVers
-      when (maybe True (ver >=) lInstStack) $ liftE $ setStack ver
+  when (maybe True (ver >=) lInstStack) $ liftE $ setStack ver
 where
  -- | Install an unpacked stack distribution.
  installStack' :: (MonadLogger m, MonadCatch m, MonadIO m)
                => FilePath      -- ^ Path to the unpacked stack bindist (where the executable resides)
                -> FilePath      -- ^ Path to install to
                -> Excepts '[CopyError] m ()
  installStack' path inst = do
    lift $ $(logInfo) "Installing stack"
    let stackFile = "stack"
    liftIO $ createDirRecursive' inst
    let destFileName = stackFile <> "-" <> T.unpack (prettyVer ver) <> exeExt
    let destPath = inst </> destFileName
    handleIO (throwE . CopyError . show) $ liftIO $ copyFile
      (path </> stackFile <> exeExt)
      destPath
    lift $ chmod_755 destPath
 -- | Install an unpacked stack distribution.
 installStackUnpacked :: (MonadLogger m, MonadCatch m, MonadIO m)
              => FilePath      -- ^ Path to the unpacked stack bindist (where the executable resides)
              -> FilePath      -- ^ Path to install to
              -> Maybe Version -- ^ Nothing for isolated installs
              -> Excepts '[CopyError] m ()
 installStackUnpacked path inst mver' = do
  lift $ $(logInfo) "Installing stack"
  let stackFile = "stack"
  liftIO $ createDirRecursive' inst
  let destFileName = stackFile
                     <> maybe "" (("-" <>) .  T.unpack . prettyVer) mver'
                     <> exeExt
  let destPath = inst </> destFileName
  handleIO (throwE . CopyError . show) $ liftIO $ copyFile
    (path </> stackFile <> exeExt)
    destPath
  lift $ chmod_755 destPath
    ---------------------
@@ -829,7 +776,7 @@ setGHC ver sghc = do
      SetGHCOnly -> pure $ Just file
      SetGHC_XY  -> do
        handle
-            (\(e :: ParseError) -> lift $ $(logWarn) (T.pack $ displayException e) >> pure Nothing)
+            (\(e :: ParseError) -> lift $ $(logWarn) [i|#{e}|] >> pure Nothing)
          $ do 
            (mj, mi) <- getMajorMinorV (_tvVersion ver)
            let major' = intToText mj <> "." <> intToText mi
@@ -871,9 +818,9 @@ setGHC ver sghc = do
        whenM (liftIO $ doesDirectoryExist fullsharedir) $ do
          let fullF   = destdir </> sharedir
          let targetF = "." </> "ghc" </> ver' </> sharedir
-          $(logDebug) $ "rm -f " <> T.pack fullF
+          $(logDebug) [i|rm -f #{fullF}|]
          hideError doesNotExistErrorType $ rmDirectoryLink fullF
-          $(logDebug) $ "ln -s " <> T.pack targetF <> " " <> T.pack fullF
+          $(logDebug) [i|ln -s #{targetF} #{fullF}|]
          liftIO
 #if defined(IS_WINDOWS)
            -- On windows we need to be more permissive
@@ -939,7 +886,7 @@ setHLS ver = do
  -- selected version, so we could end up with stray or incorrect symlinks.
  oldSyms <- lift hlsSymlinks
  forM_ oldSyms $ \f -> do
-    lift $ $(logDebug) $ "rm " <> T.pack (binDir </> f)
+    lift $ $(logDebug) [i|rm #{binDir </> f}|]
    lift $ rmLink (binDir </> f)
  -- set haskell-language-server-<ghcver> symlinks
@@ -1126,7 +1073,7 @@ listVersions lt' criteria = do
          }
      Left e -> do
        $(logWarn)
-          $ "Could not parse version of stray directory" <> T.pack e
+          [i|Could not parse version of stray directory #{e}|]
        pure Nothing
  strayCabals :: ( MonadReader env m
@@ -1161,7 +1108,7 @@ listVersions lt' criteria = do
              }
      Left e -> do
        $(logWarn)
-          $ "Could not parse version of stray directory" <> T.pack e
+          [i|Could not parse version of stray directory #{e}|]
        pure Nothing
  strayHLS :: ( MonadReader env m
@@ -1195,7 +1142,7 @@ listVersions lt' criteria = do
              }
      Left e -> do
        $(logWarn)
-          $ "Could not parse version of stray directory" <> T.pack e
+          [i|Could not parse version of stray directory #{e}|]
        pure Nothing
  strayStacks :: ( MonadReader env m
@@ -1230,7 +1177,7 @@ listVersions lt' criteria = do
              }
      Left e -> do
        $(logWarn)
-          $ "Could not parse version of stray directory" <> T.pack e
+          [i|Could not parse version of stray directory #{e}|]
        pure Nothing
  currentGHCup :: Map.Map Version VersionInfo -> Maybe ListResult
@@ -1373,23 +1320,23 @@ rmGHCVer ver = do
  -- this isn't atomic, order matters
  when isSetGHC $ do
-    lift $ $(logInfo) "Removing ghc symlinks"
+    lift $ $(logInfo) [i|Removing ghc symlinks|]
    liftE $ rmPlain (_tvTarget ver)
-  lift $ $(logInfo) "Removing ghc-x.y.z symlinks"
+  lift $ $(logInfo) [i|Removing ghc-x.y.z symlinks|]
  liftE $ rmMinorSymlinks ver
-  lift $ $(logInfo) "Removing/rewiring ghc-x.y symlinks"
+  lift $ $(logInfo) [i|Removing/rewiring ghc-x.y symlinks|]
  -- first remove
  handle (\(_ :: ParseError) -> pure ()) $ liftE $ rmMajorSymlinks ver
  -- then fix them (e.g. with an earlier version)
-  lift $ $(logInfo) $ "Removing directory recursively: " <> T.pack dir
+  lift $ $(logInfo) [i|Removing directory recursively: #{dir}|]
  lift $ recyclePathForcibly dir
  v' <-
    handle
-      (\(e :: ParseError) -> lift $ $(logWarn) (T.pack $ displayException e) >> pure Nothing)
+      (\(e :: ParseError) -> lift $ $(logWarn) [i|#{e}|] >> pure Nothing)
    $ fmap Just
    $ getMajorMinorV (_tvVersion ver)
  forM_ v' $ \(mj, mi) -> lift (getGHCForMajor mj mi (_tvTarget ver))
@@ -1460,7 +1407,7 @@ rmHLSVer ver = do
    oldSyms <- lift hlsSymlinks
    forM_ oldSyms $ \f -> do
      let fullF = binDir </> f
-      lift $ $(logDebug) $ "rm " <> T.pack fullF
+      lift $ $(logDebug) [i|rm #{fullF}|]
      lift $ rmLink fullF
    -- set latest hls
    hlsVers <- lift $ fmap rights getInstalledHLSs
@@ -1603,7 +1550,7 @@ rmGhcupDirs = do
  handleRm $ rmBinDir binDir
  handleRm $ rmDir recycleDir
 #if defined(IS_WINDOWS)
-  $logInfo $ "removing " <> T.pack (baseDir </> "msys64")
+  $logInfo [i|removing #{(baseDir </> "msys64")}|]
  handleRm $ rmPathForcibly (baseDir </> "msys64")
 #endif
@@ -1615,8 +1562,8 @@ rmGhcupDirs = do
  where
    handleRm :: (MonadCatch m, MonadLogger m)  => m () -> m ()
-    handleRm = handleIO (\e -> $logDebug $ "Part of the cleanup action failed with error: " <> T.pack (displayException e) <> "\n"
+    handleRm = handleIO (\e -> $logDebug [i|Part of the cleanup action failed with error: #{displayException e}
-                                <> "continuing regardless...")
+continuing regardless...|])
    rmEnvFile :: (MonadLogger m, MonadReader env m, HasDirs env, MonadMask m, MonadIO m, MonadCatch m) => FilePath -> m ()
    rmEnvFile enFilePath = do
@@ -1634,7 +1581,7 @@ rmGhcupDirs = do
      -- an error leaks through, we catch it here as well,
      -- althought 'deleteFile' should already handle it.
      hideErrorDef [doesNotExistErrorType] () $ do
-        $logInfo $ "removing " <> T.pack dir
+        $logInfo [i|removing #{dir}|]
        contents <- liftIO $ getDirectoryContentsRecursive dir
        forM_ contents (deleteFile . (dir </>))
@@ -1757,7 +1704,6 @@ compileGHC :: ( MonadMask m
           -> [Text]                   -- ^ additional args to ./configure
           -> Maybe String             -- ^ build flavour
           -> Bool
           -> Maybe FilePath           -- ^ isolate dir
           -> Excepts
                '[ AlreadyInstalled
                 , BuildFailed
@@ -1770,12 +1716,13 @@ compileGHC :: ( MonadMask m
                 , UnknownArchive
                 , TarDirDoesNotExist
                 , NotInstalled
-                 , DirNotEmpty
+#if !defined(TAR)
                 , ArchiveResult
 #endif
                 ]
                m
                GHCTargetVersion
-compileGHC targetGhc ov bstrap jobs mbuildConfig patchdir aargs buildFlavour hadrian isolateDir
+compileGHC targetGhc ov bstrap jobs mbuildConfig patchdir aargs buildFlavour hadrian
  = do
    PlatformRequest { .. } <- lift getPlatformReq
    GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
@@ -1783,7 +1730,7 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patchdir aargs buildFlavour had
    (workdir, tmpUnpack, tver) <- case targetGhc of
      -- unpack from version tarball
      Left tver -> do
-        lift $ $(logDebug) $ "Requested to compile: " <> tVerToText tver <> " with " <> either prettyVer T.pack bstrap
+        lift $ $(logDebug) [i|Requested to compile: #{tver} with #{bstrap}|]
        -- download source tarball
        dlInfo <-
@@ -1794,7 +1741,7 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patchdir aargs buildFlavour had
        -- unpack
        tmpUnpack <- lift mkGhcupTmpDir
        liftE $ unpackToDir tmpUnpack dl
-        liftE $ catchWarn $ lEM @_ @'[ProcessError] $ darwinNotarization _rPlatform tmpUnpack
+        void $ lift $ darwinNotarization _rPlatform tmpUnpack
        workdir <- maybe (pure tmpUnpack)
                         (liftE . intoSubdir tmpUnpack)
@@ -1808,7 +1755,7 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patchdir aargs buildFlavour had
        let git args = execLogged "git" ("--no-pager":args) (Just tmpUnpack) "git" Nothing
        tver <- reThrowAll @_ @'[ProcessError] DownloadFailed $ do
          let rep = fromMaybe "https://gitlab.haskell.org/ghc/ghc.git" repo
-          lift $ $(logInfo) $ "Fetching git repo " <> T.pack rep <> " at ref " <> T.pack ref <> " (this may take a while)"
+          lift $ $(logInfo) [i|Fetching git repo #{rep} at ref #{ref} (this may take a while)|]
          lEM $ git [ "init" ]
          lEM $ git [ "remote"
                    , "add"
@@ -1834,8 +1781,8 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patchdir aargs buildFlavour had
            ExitSuccess -> throwEither . MP.parse ghcProjectVersion "" . decUTF8Safe' $ _stdOut
            ExitFailure c -> fail ("Could not figure out GHC project version. Exit code was: " <> show c <> ". Error was: " <> T.unpack (decUTF8Safe' _stdErr))
-        liftE $ catchWarn $ lEM @_ @'[ProcessError] $ darwinNotarization _rPlatform tmpUnpack
+        void $ lift $ darwinNotarization _rPlatform tmpUnpack
-        lift $ $(logInfo) $ "Git version " <> T.pack ref <> " corresponds to GHC version " <> prettyVer tver
+        lift $ $(logInfo) [i|Git version #{ref} corresponds to GHC version #{prettyVer tver}|]
        pure (tmpUnpack, tmpUnpack, GHCTargetVersion Nothing tver)
    -- the version that's installed may differ from the
@@ -1845,18 +1792,12 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patchdir aargs buildFlavour had
    alreadyInstalled <- lift $ ghcInstalled installVer
    alreadySet <- fmap (== Just tver) $ lift $ ghcSet (_tvTarget tver)
    when alreadyInstalled $ do
-      case isolateDir of
+      lift $ $(logWarn) [i|GHC #{prettyShow tver} already installed. Will overwrite existing version.|]
        Just isoDir ->
          lift $ $(logWarn) $ "GHC " <> T.pack (prettyShow tver) <> " already installed. Isolate installing to " <> T.pack isoDir
        Nothing ->
          lift $ $(logWarn) $ "GHC " <> T.pack (prettyShow tver) <> " already installed. Will overwrite existing version."
      lift $ $(logWarn)
        "...waiting for 10 seconds before continuing, you can still abort..."
      liftIO $ threadDelay 10000000 -- give the user a sec to intervene
-    ghcdir <- case isolateDir of
+    ghcdir         <- lift $ ghcupGHCDir installVer
      Just isoDir -> pure isoDir
      Nothing -> lift $ ghcupGHCDir installVer
    bghc <- case bstrap of
      Right g    -> pure $ Right g
@@ -1873,14 +1814,9 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patchdir aargs buildFlavour had
        pure (b, bmk)
      )
-    case isolateDir of
+    when alreadyInstalled $ do
-      Nothing ->
+      lift $ $(logInfo) [i|Deleting existing installation|]
-        -- only remove old ghc in regular installs
+      liftE $ rmGHCVer tver
        when alreadyInstalled $ do
          lift $ $(logInfo) "Deleting existing installation"
          liftE $ rmGHCVer tver
      _ -> pure ()
    forM_ mBindist $ \bindist -> do
      liftE $ installPackedGHC bindist
@@ -1889,15 +1825,11 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patchdir aargs buildFlavour had
                               (tver ^. tvVersion)
    liftIO $ B.writeFile (ghcdir </> ghcUpSrcBuiltFile) bmk
-    
+
-    case isolateDir of
+    reThrowAll GHCupSetError $ postGHCInstall tver
-      -- set and make symlinks for regular (non-isolated) installs
+
-      Nothing -> do
+    -- restore
-        reThrowAll GHCupSetError $ postGHCInstall tver
+    when alreadySet $ liftE $ void $ setGHC tver SetGHCOnly
        -- restore
        when alreadySet $ liftE $ void $ setGHC tver SetGHCOnly
      _ -> pure ()
    pure tver
@@ -1952,11 +1884,11 @@ endif|]
    liftE $ configureBindist bghc tver workdir ghcdir
-    lift $ $(logInfo) "Building (this may take a while)..."
+    lift $ $(logInfo) [i|Building (this may take a while)...|]
    hadrian_build <- liftE $ findHadrianFile workdir
    lEM $ execLogged hadrian_build
-                          ( maybe [] (\j  -> ["-j" <> show j]         ) jobs
+                          ( maybe [] (\j  -> [[i|-j#{j}|]]         ) jobs
-                         ++ maybe [] (\bf -> ["--flavour=" <> bf]) buildFlavour
+                         ++ maybe [] (\bf -> [[i|--flavour=#{bf}|]]) buildFlavour
                         ++ ["binary-dist"]
                          )
                          (Just workdir) "ghc-make" Nothing
@@ -2018,19 +1950,19 @@ endif|]
        (FileDoesNotExistError bc)
        (liftIO $ copyFile bc (build_mk workdir))
      Nothing ->
-        liftIO $ T.writeFile (build_mk workdir) (addBuildFlavourToConf defaultConf)
+        liftIO $ B.writeFile (build_mk workdir) (addBuildFlavourToConf defaultConf)
    liftE $ checkBuildConfig (build_mk workdir)
-    lift $ $(logInfo) "Building (this may take a while)..."
+    lift $ $(logInfo) [i|Building (this may take a while)...|]
    lEM $ make (maybe [] (\j -> ["-j" <> fS (show j)]) jobs) (Just workdir)
    if | isCross tver -> do
-          lift $ $(logInfo) "Installing cross toolchain..."
+          lift $ $(logInfo) [i|Installing cross toolchain...|]
          lEM $ make ["install"] (Just workdir)
          pure Nothing
       | otherwise -> do
-          lift $ $(logInfo) "Creating bindist..."
+          lift $ $(logInfo) [i|Creating bindist...|]
          lEM $ make ["binary-dist"] (Just workdir)
          [tar] <- liftIO $ findFiles
            workdir
@@ -2071,20 +2003,11 @@ endif|]
      . SHA256.hashlazy
      $ c
    cTime <- liftIO getCurrentTime
-    let tarName = makeValid ("ghc-"
+    let tarName = makeValid [i|ghc-#{tVerToText tver}-#{pfReqToString pfreq}-#{iso8601Show cTime}-#{cDigest}.tar#{takeExtension tar}|]
                            <> T.unpack (tVerToText tver)
                            <> "-"
                            <> pfReqToString pfreq
                            <> "-"
                            <> iso8601Show cTime
                            <> "-"
                            <> T.unpack cDigest
                            <> ".tar"
                            <> takeExtension tar)
    let tarPath = cacheDir </> tarName
    handleIO (throwE . CopyError . show) $ liftIO $ copyFile (workdir </> tar)
                                                             tarPath
-    lift $ $(logInfo) $ "Copied bindist to " <> T.pack tarPath
+    lift $ $(logInfo) [i|Copied bindist to #{tarPath}|]
    pure tarPath
  checkBuildConfig :: (MonadCatch m, MonadIO m, MonadLogger m)
@@ -2109,12 +2032,13 @@ endif|]
      _ -> pure ()
    forM_ buildFlavour $ \bf ->
-      when (T.pack ("BuildFlavour = " <> bf) `notElem` lines') $ do
+      when ([i|BuildFlavour = #{bf}|] `notElem` lines') $ do
-        lift $ $(logWarn) $ "Customly specified build config overwrites --flavour=" <> T.pack bf <> " switch! Waiting 5 seconds..."
+        lift $ $(logWarn) [i|Customly specified build config overwrites --flavour=#{bf} switch! Waiting 5 seconds...|]
        liftIO $ threadDelay 5000000
  addBuildFlavourToConf bc = case buildFlavour of
-    Just bf -> "BuildFlavour = " <> T.pack bf <> "\n" <> bc
+    Just bf -> [i|BuildFlavour = #{bf}|] <> [s|
 |] <> [i|#{bc}|]
    Nothing -> bc
  isCross :: GHCTargetVersion -> Bool
@@ -2232,7 +2156,7 @@ upgradeGHCup mtarget force' = do
  Dirs {..} <- lift getDirs
  GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-  lift $ $(logInfo) "Upgrading GHCup..."
+  lift $ $(logInfo) [i|Upgrading GHCup...|]
  let latestVer = fromJust $ fst <$> getLatest dls GHCup
  when (not force' && (latestVer <= pvpToVersion ghcUpVer)) $ throwE NoUpdate
  dli   <- liftE $ getDownloadInfo GHCup latestVer
@@ -2241,28 +2165,20 @@ upgradeGHCup mtarget force' = do
  p <- liftE $ download (_dlUri dli) (Just (_dlHash dli)) tmp (Just fn) False
  let destDir = takeDirectory destFile
      destFile = fromMaybe (binDir </> fn) mtarget
-  lift $ $(logDebug) $ "mkdir -p " <> T.pack destDir
+  lift $ $(logDebug) [i|mkdir -p #{destDir}|]
  liftIO $ createDirRecursive' destDir
-  lift $ $(logDebug) $ "rm -f " <> T.pack destFile
+  lift $ $(logDebug) [i|rm -f #{destFile}|]
  lift $ hideError NoSuchThing $ recycleFile destFile
-  lift $ $(logDebug) $ "cp " <> T.pack p <> " " <> T.pack destFile
+  lift $ $(logDebug) [i|cp #{p} #{destFile}|]
  handleIO (throwE . CopyError . show) $ liftIO $ copyFile p
                                                           destFile
  lift $ chmod_755 destFile
  liftIO (isInPath destFile) >>= \b -> unless b $
-    lift $ $(logWarn) $ T.pack (takeFileName destFile) <> " is not in PATH! You have to add it in order to use ghcup."
+    lift $ $(logWarn) [i|"#{takeFileName destFile}" is not in PATH! You have to add it in order to use ghcup.|]
  liftIO (isShadowed destFile) >>= \case
    Nothing -> pure ()
-    Just pa -> lift $ $(logWarn) $ "ghcup is shadowed by "
+    Just pa -> lift $ $(logWarn) [i|ghcup is shadowed by "#{pa}". The upgrade will not be in effect, unless you remove "#{pa}" or make sure "#{destDir}" comes before "#{takeFileName pa}" in PATH.|]
      <> T.pack pa
      <> ". The upgrade will not be in effect, unless you remove "
      <> T.pack pa
      <> " or make sure "
      <> T.pack destDir
      <> " comes before "
      <> T.pack (takeFileName pa)
      <> " in PATH."
  pure latestVer
@@ -2273,7 +2189,6 @@ upgradeGHCup mtarget force' = do
    -------------
 -- | Creates @ghc-x.y.z@ and @ghc-x.y@ symlinks. This is used for
 -- both installing from source and bindist.
 postGHCInstall :: ( MonadReader env m
@@ -2294,7 +2209,7 @@ postGHCInstall ver@GHCTargetVersion {..} = do
  -- Create ghc-x.y symlinks. This may not be the current
  -- version, create it regardless.
  v' <-
-    handle (\(e :: ParseError) -> lift $ $(logWarn) (T.pack $ displayException e) >> pure Nothing)
+    handle (\(e :: ParseError) -> lift $ $(logWarn) [i|#{e}|] >> pure Nothing)
    $ fmap Just
    $ getMajorMinorV _tvVersion
  forM_ v' $ \(mj, mi) -> lift (getGHCForMajor mj mi _tvTarget)
@@ -2348,3 +2263,4 @@ whereIsTool tool ver@GHCTargetVersion {..} = do
      liftIO $ canonicalizePath currentRunningExecPath
--- a/lib/GHCup/Download.hs
+++ b/lib/GHCup/Download.hs
@@ -59,6 +59,7 @@ import           Data.CaseInsensitive           ( mk )
 #endif
 import           Data.List.Extra
 import           Data.Maybe
 import           Data.String.Interpolate
 import           Data.Time.Clock
 import           Data.Time.Clock.POSIX
 import           Data.Versions
@@ -171,43 +172,33 @@ getBase :: ( MonadReader env m
        -> Excepts '[JSONError] m GHCupInfo
 getBase uri = do
  Settings { noNetwork } <- lift getSettings
-
+  yaml <- lift $ yamlFromCache uri
-  -- try to download yaml... usually this writes it into cache dir,
+  unless noNetwork $
-  -- but in some cases not (e.g. when using file://), so we honour
+    handleIO (\e -> warnCache (displayException e))
-  -- the return filepath, if any
+      . catchE @_ @_ @'[] (\e@(DownloadFailed _) -> warnCache (prettyShow e))
-  mYaml <- if noNetwork && view (uriSchemeL' % schemeBSL') uri /= "file" -- for file://, let it fall through
+      . reThrowAll @_ @_ @'[DownloadFailed] DownloadFailed
-           then pure Nothing
+      . smartDl
-           else handleIO (\e -> warnCache (displayException e) >> pure Nothing)
+      $ uri
               . catchE @_ @_ @'[] (\e@(DownloadFailed _) -> warnCache (prettyShow e) >> pure Nothing)
               . reThrowAll @_ @_ @'[DownloadFailed] DownloadFailed
               . fmap Just
               . smartDl
               $ uri
  -- if we didn't get a filepath from the download, use the cached yaml
  actualYaml <- maybe (lift $ yamlFromCache uri) pure mYaml
  lift $ $(logDebug) $ "Decoding yaml at: " <> T.pack actualYaml
  liftE
-    . onE_ (onError actualYaml)
+    . onE_ (onError yaml)
    . lEM' @_ @_ @'[JSONError] JSONDecodeError
-    . fmap (first (\e -> unlines [displayException e
+    . fmap (first (\e -> [i|#{displayException e}
-                                 ,"Consider removing " <> actualYaml <> " manually."]))
+Consider removing "#{yaml}" manually.|]))
    . liftIO
    . Y.decodeFileEither
-    $ actualYaml
+    $ yaml
 where
  -- On error, remove the etags file and set access time to 0. This should ensure the next invocation
  -- may re-download and succeed.
  onError :: (MonadLogger m, MonadMask m, MonadCatch m, MonadIO m) => FilePath -> m ()
  onError fp = do
    let efp = etagsFile fp
-    handleIO (\e -> $(logWarn) $ "Couldn't remove file " <> T.pack efp <> ", error was: " <> T.pack (displayException e))
+    handleIO (\e -> $(logWarn) [i|Couldn't remove file #{efp}, error was: #{displayException e}|])
      (hideError doesNotExistErrorType $ rmFile efp)
    liftIO $ hideError doesNotExistErrorType $ setAccessTime fp (posixSecondsToUTCTime (fromIntegral @Int 0))
  warnCache s = do
-    lift $ $(logWarn) "Could not get download info, trying cached version (this may not be recent!)"
+    lift $ $(logWarn) [i|Could not get download info, trying cached version (this may not be recent!)|]
-    lift $ $(logDebug) $ "Error was: " <> T.pack s
+    lift $ $(logDebug) [i|Error was: #{s}|]
  -- First check if the json file is in the ~/.ghcup/cache dir
  -- and check it's access time. If it has been accessed within the
@@ -230,32 +221,28 @@ getBase uri = do
                , DigestError
                ]
               m1
-               FilePath
+               ()
  smartDl uri' = do
    json_file <- lift $ yamlFromCache uri'
    let scheme = view (uriSchemeL' % schemeBSL') uri'
    e <- liftIO $ doesFileExist json_file
    currentTime <- liftIO getCurrentTime
-    Dirs { cacheDir } <- lift getDirs
+    if e
      then do
        accessTime <- liftIO $ getAccessTime json_file
-       -- for local files, let's short-circuit and ignore access time
+        -- access time won't work on most linuxes, but we can try regardless
-    if | scheme == "file" -> liftE $ download uri' Nothing cacheDir Nothing True
+        when ((utcTimeToPOSIXSeconds currentTime - utcTimeToPOSIXSeconds accessTime) > 300) $
-       | e -> do
+          -- no access in last 5 minutes, re-check upstream mod time
-          accessTime <- liftIO $ getAccessTime json_file
+          dlWithMod currentTime json_file
-
+      else
-          -- access time won't work on most linuxes, but we can try regardless
+        dlWithMod currentTime json_file
          if | ((utcTimeToPOSIXSeconds currentTime - utcTimeToPOSIXSeconds accessTime) > 300) ->
                -- no access in last 5 minutes, re-check upstream mod time
                dlWithMod currentTime json_file
             | otherwise -> pure json_file
       | otherwise -> dlWithMod currentTime json_file
   where
    dlWithMod modTime json_file = do
      let (dir, fn) = splitFileName json_file
      f <- liftE $ download uri' Nothing dir (Just fn) True
      liftIO $ setModificationTime f modTime
      liftIO $ setAccessTime f modTime
-      pure f
+ 
 getDownloadInfo :: ( MonadReader env m
@@ -317,25 +304,27 @@ download :: ( MonadReader env m
            )
         => URI
         -> Maybe T.Text      -- ^ expected hash
-         -> FilePath          -- ^ destination dir (ignored for file:// scheme)
+         -> FilePath          -- ^ destination dir
         -> Maybe FilePath    -- ^ optional filename
         -> Bool              -- ^ whether to read an write etags
         -> Excepts '[DigestError , DownloadFailed] m FilePath
 download uri eDigest dest mfn etags
  | scheme == "https" = dl
  | scheme == "http"  = dl
-  | scheme == "file"  = do
+  | scheme == "file"  = cp
      let destFile' = T.unpack . decUTF8Safe $ path
      lift $ $(logDebug) $ "using local file: " <> T.pack destFile'
      forM_ eDigest (liftE . flip checkDigest destFile')
      pure destFile'
  | otherwise = throwE $ DownloadFailed (variantFromValue UnsupportedScheme)
 where
  scheme = view (uriSchemeL' % schemeBSL') uri
  cp     = do
    -- destination dir must exist
    liftIO $ createDirRecursive' dest
    let fromFile = T.unpack . decUTF8Safe $ path
    liftIO $ copyFile fromFile destFile
    pure destFile
  dl = do
-    destFile <- liftE . reThrowAll @_ @_ @'[DownloadFailed] DownloadFailed $ getDestFile
+    let uri' = decUTF8Safe (serializeURIRef' uri)
-    lift $ $(logInfo) $ "downloading: " <> uri' <> " as file " <> T.pack destFile
+    lift $ $(logInfo) [i|downloading: #{uri'}|]
    -- destination dir must exist
    liftIO $ createDirRecursive' dest
@@ -361,23 +350,23 @@ download uri eDigest dest mfn etags
                          metag <- readETag destFile
                          liftE $ lEM @_ @'[ProcessError] $ exec "curl"
                              (o' ++ (if etags then ["--dump-header", dh] else [])
-                                  ++ maybe [] (\t -> ["-H", "If-None-Match: " <> T.unpack t]) metag
+                                  ++ maybe [] (\t -> ["-H", [i|If-None-Match: #{t}|]]) metag
                                  ++ ["-fL", "-o", destFile <.> "tmp", T.unpack uri']) Nothing Nothing
                          headers <- liftIO $ T.readFile dh
                          -- this nonsense is necessary, because some older versions of curl would overwrite
                          -- the destination file when 304 is returned
-                          case fmap T.words . listToMaybe . fmap T.strip . T.lines . getLastHeader $ headers of
+                          case fmap T.words . listToMaybe . fmap T.strip . T.lines $ headers of
                            Just (http':sc:_)
                              | sc == "304"
-                              , T.pack "HTTP" `T.isPrefixOf` http' -> $logDebug "Status code was 304, not overwriting"
+                              , T.pack "HTTP" `T.isPrefixOf` http' -> $logDebug [i|Status code was 304, not overwriting|]
                              | T.pack "HTTP" `T.isPrefixOf` http' -> do
-                                  $logDebug $ "Status code was " <> sc <> ", overwriting"
+                                  $logDebug [i|Status code was #{sc}, overwriting|]
                                  liftIO $ copyFile (destFile <.> "tmp") destFile
                            _ -> liftE $ throwE @_ @'[DownloadFailed] (DownloadFailed (toVariantAt @0 (MalformedHeaders headers)
                              :: V '[MalformedHeaders]))
-                          writeEtags destFile (parseEtags headers)
+                          writeEtags (parseEtags headers)
                    else
                      liftE $ lEM @_ @'[ProcessError] $ exec "curl" 
                        (o' ++ ["-fL", "-o", destFile, T.unpack uri']) Nothing Nothing
@@ -388,19 +377,19 @@ download uri eDigest dest mfn etags
                    if etags
                      then do
                        metag <- readETag destFile
-                        let opts = o' ++ maybe [] (\t -> ["--header", "If-None-Match: " <> T.unpack t]) metag
+                        let opts = o' ++ maybe [] (\t -> ["--header", [i|If-None-Match: #{t}|]]) metag
                                      ++ ["-q", "-S", "-O", destFileTemp , T.unpack uri']
                        CapturedProcess {_exitCode, _stdErr} <- lift $ executeOut "wget" opts Nothing
                        case _exitCode of
                          ExitSuccess -> do
                            liftIO $ copyFile destFileTemp destFile
-                            writeEtags destFile (parseEtags (decUTF8Safe' _stdErr))
+                            writeEtags (parseEtags (decUTF8Safe' _stdErr))
                          ExitFailure i'
                            | i' == 8
                            , Just _ <- find (T.pack "304 Not Modified" `T.isInfixOf`) . T.lines . decUTF8Safe' $ _stdErr
                                     -> do
                                          $logDebug "Not modified, skipping download"
-                                          writeEtags destFile (parseEtags (decUTF8Safe' _stdErr))
+                                          writeEtags (parseEtags (decUTF8Safe' _stdErr))
                            | otherwise -> throwE (NonZeroExit i' "wget" opts)
                      else do
                        let opts = o' ++ ["-O", destFileTemp , T.unpack uri']
@@ -415,10 +404,10 @@ download uri eDigest dest mfn etags
                      let addHeaders = maybe mempty (\etag -> M.fromList [ (mk . E.encodeUtf8 . T.pack $ "If-None-Match"
                                                                         , E.encodeUtf8 etag)]) metag
                      liftE
-                        $ catchE @HTTPNotModified @'[DownloadFailed] @'[] (\(HTTPNotModified etag) -> lift $ writeEtags destFile (pure $ Just etag))
+                        $ catchE @HTTPNotModified @'[DownloadFailed] @'[] (\(HTTPNotModified etag) -> lift $ writeEtags (pure $ Just etag))
                        $ do
                          r <- downloadToFile https host fullPath port destFile addHeaders
-                          writeEtags destFile (pure $ decUTF8Safe <$> getHeader r "etag")
+                          writeEtags (pure $ decUTF8Safe <$> getHeader r "etag")
                    else void $ liftE $ catchE @HTTPNotModified
                                        @'[DownloadFailed]
                                   (\e@(HTTPNotModified _) ->
@@ -431,28 +420,22 @@ download uri eDigest dest mfn etags
  -- Manage to find a file we can write the body into.
-  getDestFile :: Monad m => Excepts '[NoUrlBase] m FilePath
+  destFile :: FilePath
-  getDestFile = 
+  destFile = maybe (dest </> T.unpack (decUTF8Safe (urlBaseName path)))
-    case mfn of
+                  (dest </>)
-        Just fn -> pure (dest </> fn)
+                  mfn
        Nothing
          | let urlBase = T.unpack (decUTF8Safe (urlBaseName path))
          , not (null urlBase) -> pure (dest </> urlBase)
          -- TODO: remove this once we use hpath again
          | otherwise -> throwE $ NoUrlBase uri'
  path = view pathL' uri
  uri' = decUTF8Safe (serializeURIRef' uri)
  parseEtags :: (MonadLogger m, MonadIO m, MonadThrow m) => T.Text -> m (Maybe T.Text)
  parseEtags stderr = do
-    let mEtag = find (\line -> T.pack "etag:" `T.isPrefixOf` T.toLower line) . fmap T.strip . T.lines . getLastHeader $ stderr
+    let mEtag = find (\line -> T.pack "etag:" `T.isPrefixOf` T.toLower line) . fmap T.strip . T.lines $ stderr
    case T.words <$> mEtag of
      (Just []) -> do
        $logDebug "Couldn't parse etags, no input: "
        pure Nothing
      (Just [_, etag']) -> do
-        $logDebug $ "Parsed etag: " <> etag'
+        $logDebug [i|Parsed etag: #{etag'}|]
        pure (Just etag')
      (Just xs) -> do
        $logDebug ("Couldn't parse etags, unexpected input: " <> T.unwords xs)
@@ -461,14 +444,14 @@ download uri eDigest dest mfn etags
        $logDebug "No etags header found"
        pure Nothing
-  writeEtags :: (MonadLogger m, MonadIO m, MonadThrow m) => FilePath -> m (Maybe T.Text) -> m ()
+  writeEtags :: (MonadLogger m, MonadIO m, MonadThrow m) => m (Maybe T.Text) -> m ()
-  writeEtags destFile getTags = do
+  writeEtags getTags = do
    getTags >>= \case
      Just t -> do
-        $logDebug $ "Writing etagsFile " <> T.pack (etagsFile destFile)
+        $logDebug [i|Writing etagsFile #{(etagsFile destFile)}|]
        liftIO $ T.writeFile (etagsFile destFile) t
      Nothing ->
-        $logDebug "No etags files written"
+        $logDebug [i|No etags files written|]
  readETag :: (MonadLogger m, MonadCatch m, MonadIO m) => FilePath -> m (Maybe T.Text)
  readETag fp = do
@@ -478,13 +461,13 @@ download uri eDigest dest mfn etags
      rE <- try @_ @SomeException $ liftIO $ fmap stripNewline' $ T.readFile (etagsFile fp)
      case rE of
        (Right et) -> do
-          $logDebug $ "Read etag: " <> et
+          $logDebug [i|Read etag: #{et}|]
          pure (Just et)
        (Left _) -> do
-          $logDebug "Etag file doesn't exist (yet)"
+          $logDebug [i|Etag file doesn't exist (yet)|]
          pure Nothing
    else do
-      $logDebug $ "Skipping and deleting etags file because destination file " <> T.pack fp <> " doesn't exist"
+      $logDebug [i|Skipping and deleting etags file because destination file #{fp} doesn't exist|]
      liftIO $ hideError doesNotExistErrorType $ rmFile (etagsFile fp)
      pure Nothing
@@ -562,7 +545,7 @@ checkDigest eDigest file = do
  let verify = not noVerify
  when verify $ do
    let p' = takeFileName file
-    lift $ $(logInfo) $ "verifying digest of: " <> T.pack p'
+    lift $ $(logInfo) [i|verifying digest of: #{p'}|]
    c <- liftIO $ L.readFile file
    cDigest <- throwEither . E.decodeUtf8' . B16.encode . SHA256.hashlazy $ c
    when ((cDigest /= eDigest) && verify) $ throwE (DigestError cDigest eDigest)
@@ -584,23 +567,7 @@ getWgetOpts =
    Nothing -> pure []
 -- | Get the url base name.
 --
 -- >>> urlBaseName "/foo/bar/baz"
 -- "baz"
 urlBaseName :: ByteString  -- ^ the url path (without scheme and host)
            -> ByteString
 urlBaseName = snd . B.breakEnd (== _slash) . urlDecode False
 -- | Curl saves all intermediate connect headers as well, not just the last one, so we make an effort to take the
 -- last HTTP block only. Passing '--suppress-connect-headers' would be better, but it isn't supported by all versions,
 -- also see:
 --   https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/213
 --
 -- >>> getLastHeader "\n\nHTTP/1.0 200 Connection established\n\nHTTP/1.1 304 Not Modified\n"
 -- "HTTP/1.1 304 Not Modified\n"
 -- >>> getLastHeader "HTTP/1.1 304 Not Modified\n"
 -- "HTTP/1.1 304 Not Modified\n"
 getLastHeader :: T.Text -> T.Text
 getLastHeader = T.unlines . lastDef [] . filter (\x -> not (null x)) . splitOn [""] . fmap T.stripEnd . T.lines
--- a/lib/GHCup/Errors.hs
+++ b/lib/GHCup/Errors.hs
@@ -4,6 +4,7 @@
 {-# LANGUAGE ExistentialQuantification #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE QuasiQuotes           #-}
 {-# LANGUAGE TypeOperators           #-}
 {-# LANGUAGE FlexibleInstances           #-}
@@ -20,10 +21,15 @@ module GHCup.Errors where
 import           GHCup.Types
 #if !defined(TAR)
 import           Codec.Archive
 #else
 import qualified Codec.Archive.Tar             as Tar
 #endif
 import           Control.Exception.Safe
 import           Data.ByteString                ( ByteString )
 import           Data.CaseInsensitive           ( CI )
 import           Data.String.Interpolate
 import           Data.Text                      ( Text )
 import           Data.Versions
 import           Haskus.Utils.Variant
@@ -32,7 +38,6 @@ import           Text.PrettyPrint.HughesPJClass hiding ( (<>) )
 import           URI.ByteString
 import qualified Data.Map.Strict               as M
 import qualified Data.Text                     as T
@@ -87,7 +92,7 @@ data UnknownArchive = UnknownArchive FilePath
 instance Pretty UnknownArchive where
  pPrint (UnknownArchive file) =
-    text $ "The archive format is unknown. We don't know how to extract the file " <> file
+    text [i|The archive format is unknown. We don't know how to extract the file "#{file}"|]
 -- | The scheme is not supported (such as ftp).
 data UnsupportedScheme = UnsupportedScheme
@@ -110,7 +115,7 @@ data TagNotFound = TagNotFound Tag Tool
 instance Pretty TagNotFound where
  pPrint (TagNotFound tag tool) =
-    text "Unable to find tag" <+> pPrint tag <+> text "of tool" <+> pPrint tool
+    text "Unable to find tag" <+> pPrint tag <+> text [i|of tool "#{tool}"|]
 -- | Unable to find the next version of a tool (the one after the currently
 -- set one).
@@ -119,7 +124,7 @@ data NextVerNotFound = NextVerNotFound Tool
 instance Pretty NextVerNotFound where
  pPrint (NextVerNotFound tool) =
-    text "Unable to find next (the one after the currently set one) version of tool" <+> pPrint tool
+    text [i|Unable to find next (the one after the currently set one) version of tool "#{tool}"|]
 -- | The tool (such as GHC) is already installed with that version.
 data AlreadyInstalled = AlreadyInstalled Tool Version
@@ -127,14 +132,7 @@ data AlreadyInstalled = AlreadyInstalled Tool Version
 instance Pretty AlreadyInstalled where
  pPrint (AlreadyInstalled tool ver') =
-    pPrint tool <+> text "-" <+> pPrint ver' <+> text "is already installed"
+    text [i|#{tool}-#{prettyShow ver'} is already installed|]
 -- | The Directory is supposed to be empty, but wasn't.
 data DirNotEmpty = DirNotEmpty {path :: FilePath}
 instance Pretty DirNotEmpty where
  pPrint (DirNotEmpty path) = do
    text $ "The directory was expected to be empty, but isn't: " <> path
 -- | The tool is not installed. Some operations rely on a tool
 -- to be installed (such as setting the current GHC version).
@@ -143,7 +141,7 @@ data NotInstalled = NotInstalled Tool GHCTargetVersion
 instance Pretty NotInstalled where
  pPrint (NotInstalled tool ver) =
-    text "The version" <+> pPrint ver <+> text "of the tool" <+> pPrint tool <+> text "is not installed."
+    text [i|The version "#{prettyShow ver}" of the tool "#{tool}" is not installed.|]
 -- | An executable was expected to be in PATH, but was not found.
 data NotFoundInPATH = NotFoundInPATH FilePath
@@ -151,7 +149,7 @@ data NotFoundInPATH = NotFoundInPATH FilePath
 instance Pretty NotFoundInPATH where
  pPrint (NotFoundInPATH exe) =
-    text $ "The exe " <> exe <> " was not found in PATH."
+    text [i|The exe "#{exe}" was not found in PATH.|]
 -- | JSON decoding failed.
 data JSONError = JSONDecodeError String
@@ -159,7 +157,7 @@ data JSONError = JSONDecodeError String
 instance Pretty JSONError where
  pPrint (JSONDecodeError err) =
-    text $ "JSON decoding failed with: " <> err
+    text [i|JSON decoding failed with: #{err}|]
 -- | A file that is supposed to exist does not exist
 -- (e.g. when we use file scheme to "download" something).
@@ -168,17 +166,7 @@ data FileDoesNotExistError = FileDoesNotExistError FilePath
 instance Pretty FileDoesNotExistError where
  pPrint (FileDoesNotExistError file) =
-    text $ "File " <> file <> " does not exist."
+    text [i|File "#{file}" does not exist.|]
 -- | The file already exists
 -- (e.g. when we use isolated installs with the same path).
 -- (e.g. This is done to prevent any overwriting)
 data FileAlreadyExistsError = FileAlreadyExistsError FilePath
  deriving Show
 instance Pretty FileAlreadyExistsError where
  pPrint (FileAlreadyExistsError file) =
    text $ "File " <> file <> " Already exists."
 data TarDirDoesNotExist = TarDirDoesNotExist TarDir
  deriving Show
@@ -193,7 +181,7 @@ data DigestError = DigestError Text Text
 instance Pretty DigestError where
  pPrint (DigestError currentDigest expectedDigest) =
-    text "Digest error: expected" <+> text (T.unpack expectedDigest) <+> text "but got" <+> pPrint currentDigest
+    text [i|Digest error: expected "#{expectedDigest}", but got "#{currentDigest}"|]
 -- | Unexpected HTTP status.
 data HTTPStatusError = HTTPStatusError Int (M.Map (CI ByteString) ByteString)
@@ -201,7 +189,7 @@ data HTTPStatusError = HTTPStatusError Int (M.Map (CI ByteString) ByteString)
 instance Pretty HTTPStatusError where
  pPrint (HTTPStatusError status _) =
-    text "Unexpected HTTP status:" <+> pPrint status
+    text [i|Unexpected HTTP status: #{status}|]
 -- | Malformed headers.
 data MalformedHeaders = MalformedHeaders Text
@@ -209,7 +197,7 @@ data MalformedHeaders = MalformedHeaders Text
 instance Pretty MalformedHeaders where
  pPrint (MalformedHeaders h) =
-    text "Headers are malformed: " <+> pPrint h
+    text [i|Headers are malformed: #{h}|]
 -- | Unexpected HTTP status.
 data HTTPNotModified = HTTPNotModified Text
@@ -217,7 +205,7 @@ data HTTPNotModified = HTTPNotModified Text
 instance Pretty HTTPNotModified where
  pPrint (HTTPNotModified etag) =
-    text "Remote resource not modifed, etag was:" <+> pPrint etag
+    text [i|Remote resource not modifed, etag was: #{etag}|]
 -- | The 'Location' header was expected during a 3xx redirect, but not found.
 data NoLocationHeader = NoLocationHeader
@@ -225,7 +213,7 @@ data NoLocationHeader = NoLocationHeader
 instance Pretty NoLocationHeader where
  pPrint NoLocationHeader =
-    text "The 'Location' header was expected during a 3xx redirect, but not found."
+    text [i|The 'Location' header was expected during a 3xx redirect, but not found.|]
 -- | Too many redirects.
 data TooManyRedirs = TooManyRedirs
@@ -233,7 +221,7 @@ data TooManyRedirs = TooManyRedirs
 instance Pretty TooManyRedirs where
  pPrint TooManyRedirs =
-    text "Too many redirections."
+    text [i|Too many redirections.|]
 -- | A patch could not be applied.
 data PatchFailed = PatchFailed
@@ -241,7 +229,7 @@ data PatchFailed = PatchFailed
 instance Pretty PatchFailed where
  pPrint PatchFailed =
-    text "A patch could not be applied."
+    text [i|A patch could not be applied.|]
 -- | The tool requirements could not be found.
 data NoToolRequirements = NoToolRequirements
@@ -249,35 +237,35 @@ data NoToolRequirements = NoToolRequirements
 instance Pretty NoToolRequirements where
  pPrint NoToolRequirements =
-    text "The Tool requirements could not be found."
+    text [i|The Tool requirements could not be found.|]
 data InvalidBuildConfig = InvalidBuildConfig Text
  deriving Show
 instance Pretty InvalidBuildConfig where
  pPrint (InvalidBuildConfig reason) =
-    text "The build config is invalid. Reason was:" <+> pPrint reason
+    text [i|The build config is invalid. Reason was: #{reason}|]
 data NoToolVersionSet = NoToolVersionSet Tool
  deriving Show
 instance Pretty NoToolVersionSet where
  pPrint (NoToolVersionSet tool) =
-    text "No version is set for tool" <+> pPrint tool <+> text "."
+    text [i|No version is set for tool "#{tool}".|]
 data NoNetwork = NoNetwork
  deriving Show
 instance Pretty NoNetwork where
  pPrint NoNetwork =
-    text "A download was required or requested, but '--offline' was specified."
+    text [i|A download was required or requested, but '--offline' was specified.|]
 data HadrianNotFound = HadrianNotFound
  deriving Show
 instance Pretty HadrianNotFound where
  pPrint HadrianNotFound =
-    text "Could not find Hadrian build files. Does this GHC version support Hadrian builds?"
+    text [i|Could not find Hadrian build files. Does this GHC version support Hadrian builds?|]
    -------------------------
@@ -299,17 +287,17 @@ data BuildFailed = forall es . (Pretty (V es), Show (V es)) => BuildFailed FileP
 instance Pretty BuildFailed where
  pPrint (BuildFailed path reason) =
-    text "BuildFailed failed in dir" <+> text (path <> ":") <+> pPrint reason
+    text [i|BuildFailed failed in dir "#{path}": |] <> pPrint reason
 deriving instance Show BuildFailed
 -- | Setting the current GHC version failed.
-data GHCupSetError = forall es . (Show (V es), Pretty (V es)) => GHCupSetError (V es)
+data GHCupSetError = forall es . Show (V es) => GHCupSetError (V es)
 instance Pretty GHCupSetError where
  pPrint (GHCupSetError reason) =
-    text "Setting the current GHC version failed:" <+> pPrint reason
+    text [i|Setting the current GHC version failed: #{reason}|]
 deriving instance Show GHCupSetError
@@ -325,7 +313,7 @@ data ParseError = ParseError String
 instance Pretty ParseError where
  pPrint (ParseError reason) =
-    text "Parsing failed:" <+> pPrint reason
+    text [i|Parsing failed: #{reason}|]
 instance Exception ParseError
@@ -335,19 +323,10 @@ data UnexpectedListLength = UnexpectedListLength String
 instance Pretty UnexpectedListLength where
  pPrint (UnexpectedListLength reason) =
-    text "List length unexpected:" <+> pPrint reason
+    text [i|List length unexpected: #{reason}|]
 instance Exception UnexpectedListLength
 data NoUrlBase = NoUrlBase Text
  deriving Show
 instance Pretty NoUrlBase where
  pPrint (NoUrlBase url) =
    text "Couldn't get a base filename from url" <+> pPrint url
 instance Exception NoUrlBase
    ------------------------
@@ -369,22 +348,23 @@ instance
 instance Pretty URIParseError where
  pPrint (MalformedScheme reason) =
-    text "Failed to parse URI. Malformed scheme:" <+> text (show reason)
+    text [i|Failed to parse URI. Malformed scheme: #{reason}|]
  pPrint MalformedUserInfo =
-    text "Failed to parse URI. Malformed user info."
+    text [i|Failed to parse URI. Malformed user info.|]
  pPrint MalformedQuery =
-    text "Failed to parse URI. Malformed query."
+    text [i|Failed to parse URI. Malformed query.|]
  pPrint MalformedFragment =
-    text "Failed to parse URI. Malformed fragment."
+    text [i|Failed to parse URI. Malformed fragment.|]
  pPrint MalformedHost =
-    text "Failed to parse URI. Malformed host."
+    text [i|Failed to parse URI. Malformed host.|]
  pPrint MalformedPort =
-    text "Failed to parse URI. Malformed port."
+    text [i|Failed to parse URI. Malformed port.|]
  pPrint MalformedPath =
-    text "Failed to parse URI. Malformed path."
+    text [i|Failed to parse URI. Malformed path.|]
  pPrint (OtherError err) =
-    text "Failed to parse URI:" <+> pPrint err
+    text [i|Failed to parse URI: #{err}|]
 #if !defined(TAR)
 instance Pretty ArchiveResult where
  pPrint ArchiveFatal = text "Archive result: fatal"
  pPrint ArchiveFailed = text "Archive result: failed"
@@ -392,6 +372,14 @@ instance Pretty ArchiveResult where
  pPrint ArchiveRetry = text "Archive result: retry"
  pPrint ArchiveOk = text "Archive result: Ok"
  pPrint ArchiveEOF = text "Archive result: EOF"
-
+#else
-instance Pretty T.Text where
+instance Pretty Tar.FormatError where
-  pPrint = text . T.unpack
+  pPrint Tar.TruncatedArchive = text "Truncated archive"
  pPrint Tar.ShortTrailer = text "Short trailer"
  pPrint Tar.BadTrailer = text "Bad trailer"
  pPrint Tar.TrailingJunk = text "Trailing junk"
  pPrint Tar.ChecksumIncorrect = text "Checksum incorrect"
  pPrint Tar.NotTarFormat = text "Not a tar format"
  pPrint Tar.UnrecognisedTarFormat = text "Unrecognised tar format"
  pPrint Tar.HeaderBadNumericEncoding = text "Header has bad numeric encoding"
 #endif
--- a/lib/GHCup/Platform.hs
+++ b/lib/GHCup/Platform.hs
@@ -33,6 +33,7 @@ import           Control.Monad.Reader
 import           Data.ByteString                ( ByteString )
 import           Data.Foldable
 import           Data.Maybe
 import           Data.String.Interpolate
 import           Data.Text                      ( Text )
 import           Data.Versions
 import           Haskus.Utils.Variant.Excepts
@@ -107,7 +108,7 @@ getPlatform = do
      pure $ PlatformResult { _platform = FreeBSD, _distroVersion = ver }
    "mingw32" -> pure PlatformResult { _platform = Windows, _distroVersion = Nothing }
    what -> throwE $ NoCompatiblePlatform what
-  lift $ $(logDebug) $ "Identified Platform as: " <> T.pack (prettyShow pfr)
+  lift $ $(logDebug) [i|Identified Platform as: #{prettyShow pfr}|]
  pure pfr
 where
  getFreeBSDVersion = lift $ fmap _stdOut $ executeOut "freebsd-version" [] Nothing
--- a/lib/GHCup/Types.hs
+++ b/lib/GHCup/Types.hs
@@ -115,13 +115,6 @@ data Tool = GHC
          | Stack
  deriving (Eq, GHC.Generic, Ord, Show, Enum, Bounded)
 instance Pretty Tool where
  pPrint GHC = text "ghc"
  pPrint Cabal = text "cabal"
  pPrint GHCup = text "ghcup"
  pPrint HLS = text "hls"
  pPrint Stack = text "stack"
 instance NFData Tool
 data GlobalTool = ShimGen
@@ -227,7 +220,6 @@ data LinuxDistro = Debian
                 | RedHat
                 | Alpine
                 | AmazonLinux
                 | Solus
                 -- rolling
                 | Gentoo
                 | Exherbo
@@ -247,7 +239,6 @@ distroToString CentOS = "centos"
 distroToString RedHat = "redhat"
 distroToString Alpine = "alpine"
 distroToString AmazonLinux = "amazon"
 distroToString Solus = "solus"
 distroToString Gentoo = "gentoo"
 distroToString Exherbo = "exherbo"
 distroToString UnknownLinux = "unknown"
@@ -313,41 +304,6 @@ data UserSettings = UserSettings
 defaultUserSettings :: UserSettings
 defaultUserSettings = UserSettings Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
 fromSettings :: Settings -> Maybe KeyBindings -> UserSettings
 fromSettings Settings{..} Nothing =
  UserSettings {
      uCache = Just cache
    , uNoVerify = Just noVerify
    , uVerbose = Just verbose
    , uKeepDirs = Just keepDirs
    , uDownloader = Just downloader
    , uNoNetwork = Just noNetwork
    , uKeyBindings = Nothing
    , uUrlSource = Just urlSource
  }
 fromSettings Settings{..} (Just KeyBindings{..}) =
  let ukb = UserKeyBindings
            { kUp           = Just bUp        
            , kDown         = Just bDown      
            , kQuit         = Just bQuit      
            , kInstall      = Just bInstall   
            , kUninstall    = Just bUninstall 
            , kSet          = Just bSet       
            , kChangelog    = Just bChangelog 
            , kShowAll      = Just bShowAllVersions
            , kShowAllTools = Just bShowAllTools
            }
  in UserSettings {
      uCache = Just cache
    , uNoVerify = Just noVerify
    , uVerbose = Just verbose
    , uKeepDirs = Just keepDirs
    , uDownloader = Just downloader
    , uNoNetwork = Just noNetwork
    , uKeyBindings = Just ukb
    , uUrlSource = Just urlSource
  }
 data UserKeyBindings = UserKeyBindings
  { kUp        :: Maybe Key
  , kDown      :: Maybe Key
--- a/lib/GHCup/Types/JSON.hs
+++ b/lib/GHCup/Types/JSON.hs
@@ -316,6 +316,3 @@ deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField } ''URLSource
 deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField } ''Key
 deriveJSON defaultOptions { fieldLabelModifier = \str' -> maybe str' T.unpack . T.stripPrefix (T.pack "k-") . T.pack . kebab $ str' } ''UserKeyBindings
 deriveJSON defaultOptions { fieldLabelModifier = \str' -> maybe str' T.unpack . T.stripPrefix (T.pack "u-") . T.pack . kebab $ str' } ''UserSettings
 deriveToJSON defaultOptions { fieldLabelModifier = kebab } ''Settings
 deriveToJSON defaultOptions { fieldLabelModifier = drop 2 . kebab } ''KeyBindings -- move under key-bindings key
--- a/lib/GHCup/Utils.hs
+++ b/lib/GHCup/Utils.hs
@@ -39,7 +39,9 @@ import           GHCup.Utils.MegaParsec
 import           GHCup.Utils.Prelude
 import           GHCup.Utils.String.QQ
 #if !defined(TAR)
 import           Codec.Archive           hiding ( Directory )
 #endif
 import           Codec.Archive.Zip
 import           Control.Applicative
 import           Control.Exception.Safe
@@ -62,6 +64,7 @@ import           Data.List
 import           Data.List.Extra
 import           Data.List.NonEmpty             ( NonEmpty( (:|) ))
 import           Data.Maybe
 import           Data.String.Interpolate
 import           Data.Text                      ( Text )
 import           Data.Versions
 import           GHC.IO.Exception
@@ -80,6 +83,9 @@ import           Text.PrettyPrint.HughesPJClass hiding ( (<>) )
 import           Text.Regex.Posix
 import           URI.ByteString
 #if defined(TAR)
 import qualified Codec.Archive.Tar             as Tar
 #endif
 import qualified Codec.Compression.BZip        as BZip
 import qualified Codec.Compression.GZip        as GZip
 import qualified Codec.Compression.Lzma        as Lzma
@@ -129,7 +135,7 @@ rmMinorSymlinks tv@GHCTargetVersion{..} = do
  forM_ files $ \f -> do
    let f_xyz = f <> "-" <> T.unpack (prettyVer _tvVersion) <> exeExt
    let fullF = binDir </> f_xyz
-    lift $ $(logDebug) ("rm -f " <> T.pack fullF)
+    lift $ $(logDebug) [i|rm -f #{fullF}|]
    lift $ hideError doesNotExistErrorType $ rmLink fullF
@@ -151,11 +157,11 @@ rmPlain target = do
    files <- liftE $ ghcToolFiles tv
    forM_ files $ \f -> do
      let fullF = binDir </> f <> exeExt
-      lift $ $(logDebug) ("rm -f " <> T.pack fullF)
+      lift $ $(logDebug) [i|rm -f #{fullF}|]
      lift $ hideError doesNotExistErrorType $ rmLink fullF
    -- old ghcup
    let hdc_file = binDir </> "haddock-ghc" <> exeExt
-    lift $ $(logDebug) ("rm -f " <> T.pack hdc_file)
+    lift $ $(logDebug) [i|rm -f #{hdc_file}|]
    lift $ hideError doesNotExistErrorType $ rmLink hdc_file
@@ -179,7 +185,7 @@ rmMajorSymlinks tv@GHCTargetVersion{..} = do
  forM_ files $ \f -> do
    let f_xy = f <> "-" <> T.unpack v' <> exeExt
    let fullF = binDir </> f_xy
-    lift $ $(logDebug) "rm -f #{fullF}"
+    lift $ $(logDebug) [i|rm -f #{fullF}|]
    lift $ hideError doesNotExistErrorType $ rmLink fullF
@@ -295,11 +301,7 @@ cabalSet = do
        case linkVersion =<< link of
          Right v -> pure $ Just v
          Left err -> do
-            $(logWarn) $ "Failed to parse cabal symlink target with: "
+            $(logWarn) [i|Failed to parse cabal symlink target with: "#{err}". The symlink #{cabalbin} needs to point to valid cabal binary, such as 'cabal-3.4.0.0'.|]
              <> T.pack (displayException err)
              <> ". The symlink "
              <> T.pack cabalbin
              <> " needs to point to valid cabal binary, such as 'cabal-3.4.0.0'."
            pure Nothing
 where
  -- We try to be extra permissive with link destination parsing,
@@ -383,11 +385,7 @@ stackSet = do
        case linkVersion =<< link of
          Right v -> pure $ Just v
          Left err -> do
-            $(logWarn) $ "Failed to parse stack symlink target with: "
+            $(logWarn) [i|Failed to parse stack symlink target with: "#{err}". The symlink #{stackBin} needs to point to valid stack binary, such as 'stack-2.7.1'.|]
              <> T.pack (displayException err)
              <> ". The symlink "
              <> T.pack stackBin
              <> " needs to point to valid stack binary, such as 'stack-2.7.1'."
            pure Nothing
 where
  linkVersion :: MonadThrow m => FilePath -> m Version
@@ -605,17 +603,27 @@ unpackToDir :: (MonadLogger m, MonadIO m, MonadThrow m)
            => FilePath       -- ^ destination dir
            -> FilePath       -- ^ archive path
            -> Excepts '[UnknownArchive
 #if !defined(TAR)
                        , ArchiveResult
 #endif
                        ] m ()
 unpackToDir dfp av = do
  let fn = takeFileName av
-  lift $ $(logInfo) $ "Unpacking: " <> T.pack fn <> " to " <> T.pack dfp
+  lift $ $(logInfo) [i|Unpacking: #{fn} to #{dfp}|]
 #if defined(TAR)
  let untar :: MonadIO m => BL.ByteString -> Excepts '[] m ()
      untar = liftIO . Tar.unpack dfp . Tar.read
      rf :: MonadIO m => FilePath -> Excepts '[] m BL.ByteString
      rf = liftIO . BL.readFile
 #else
  let untar :: MonadIO m => BL.ByteString -> Excepts '[ArchiveResult] m ()
      untar = lEM . liftIO . runArchiveM . unpackToDirLazy dfp
      rf :: MonadIO m => FilePath -> Excepts '[ArchiveResult] m BL.ByteString
      rf = liftIO . BL.readFile
 #endif
  -- extract, depending on file extension
  if
@@ -636,16 +644,34 @@ unpackToDir dfp av = do
 getArchiveFiles :: (MonadLogger m, MonadIO m, MonadThrow m)
                => FilePath       -- ^ archive path
                -> Excepts '[UnknownArchive
 #if defined(TAR)
                            , Tar.FormatError
 #else
                            , ArchiveResult
 #endif
                            ] m [FilePath]
 getArchiveFiles av = do
  let fn = takeFileName av
 #if defined(TAR)
  let entries :: Monad m => BL.ByteString -> Excepts '[Tar.FormatError] m [FilePath]
      entries =
          lE @Tar.FormatError
          . Tar.foldEntries
            (\e x -> fmap (Tar.entryPath e :) x)
            (Right [])
            (\e -> Left e)
          . Tar.read
      rf :: MonadIO m => FilePath -> Excepts '[Tar.FormatError] m BL.ByteString
      rf = liftIO . BL.readFile
 #else
  let entries :: Monad m => BL.ByteString -> Excepts '[ArchiveResult] m [FilePath]
      entries = (fmap . fmap) filepath . lE . readArchiveBSL
      rf :: MonadIO m => FilePath -> Excepts '[ArchiveResult] m BL.ByteString
      rf = liftIO . BL.readFile
 #endif
  -- extract, depending on file extension
  if
@@ -800,7 +826,7 @@ applyPatches :: (MonadReader env m, HasDirs env, MonadLogger m, MonadIO m)
 applyPatches pdir ddir = do
  patches <- (fmap . fmap) (pdir </>) $ liftIO $ listDirectory pdir
  forM_ (sort patches) $ \patch' -> do
-    lift $ $(logInfo) $ "Applying patch " <> T.pack patch'
+    lift $ $(logInfo) [i|Applying patch #{patch'}|]
    fmap (either (const Nothing) Just)
         (exec
           "patch"
@@ -871,8 +897,8 @@ runBuildAction bdir instdir action = do
 -- printing other errors without crashing.
 rmBDir :: (MonadLogger m, MonadUnliftIO m, MonadIO m) => FilePath -> m ()
 rmBDir dir = withRunInIO (\run -> run $
-           liftIO $ handleIO (\e -> run $ $(logWarn) $
+           liftIO $ handleIO (\e -> run $ $(logWarn)
-               "Couldn't remove build dir " <> T.pack dir <> ", error was: " <> T.pack (displayException e))
+               [i|Couldn't remove build dir #{dir}, error was: #{displayException e}|])
           $ hideError doesNotExistErrorType
           $ rmPathForcibly dir)
@@ -1006,17 +1032,17 @@ createLink link exe = do
      fullLink = takeDirectory exe </> link
      shimContents = "path = " <> fullLink
-  $(logDebug) $ "rm -f " <> T.pack exe
+  $(logDebug) [i|rm -f #{exe}|]
  rmLink exe
-  $(logDebug) $ "ln -s " <> T.pack fullLink <> " " <> T.pack exe
+  $(logDebug) [i|ln -s #{fullLink} #{exe}|]
  liftIO $ copyFile shimGen exe
  liftIO $ writeFile shim shimContents
 #else
-  $(logDebug) $ "rm -f " <> T.pack exe
+  $(logDebug) [i|rm -f #{exe}|]
  hideError doesNotExistErrorType $ recycleFile exe
-  $(logDebug) $ "ln -s " <> T.pack link <> " " <> T.pack exe
+  $(logDebug) [i|ln -s #{link} #{exe}|]
  liftIO $ createFileLink link exe
 #endif
@@ -1041,8 +1067,8 @@ ensureGlobalTools = do
    $ maybe (Left NoDownload) Right $ Map.lookup ShimGen gTools
  let dl = downloadCached' shimDownload (Just "gs.exe") Nothing
  void $ (\(DigestError _ _) -> do
-      lift $ $(logWarn) "Digest doesn't match, redownloading gs.exe..."
+      lift $ $(logWarn) [i|Digest doesn't match, redownloading gs.exe...|]
-      lift $ $(logDebug) "rm -f #{shimDownload}"
+      lift $ $(logDebug) [i|rm -f #{shimDownload}|]
      lift $ hideError doesNotExistErrorType $ recycleFile (cacheDir dirs </> "gs.exe")
      liftE @'[DigestError , DownloadFailed] $ dl
    ) `catchE` (liftE @'[DigestError , DownloadFailed] dl)
--- a/lib/GHCup/Utils/Dirs.hs
+++ b/lib/GHCup/Utils/Dirs.hs
@@ -50,6 +50,7 @@ import           Control.Monad.Reader
 import           Control.Monad.Trans.Resource hiding (throwM)
 import           Data.Bifunctor
 import           Data.Maybe
 import           Data.String.Interpolate
 import           GHC.IO.Exception               ( IOErrorType(NoSuchThing) )
 import           Haskus.Utils.Variant.Excepts
 import           Optics
@@ -273,13 +274,7 @@ mkGhcupTmpDir = do
  let minSpace = 5000 -- a rough guess, aight?
  space <- handleIO (\_ -> pure Nothing) $ fmap Just $ liftIO $ getAvailSpace tmpdir
  when (maybe False (toBytes minSpace >) space) $ do
-    $(logWarn) ("Possibly insufficient disk space on "
+    $(logWarn) [i|Possibly insufficient disk space on #{tmpdir}. At least #{minSpace} MB are recommended, but only #{toMB (fromJust space)} are free. Consider freeing up disk space or setting TMPDIR env variable.|]
      <> T.pack tmpdir
      <> ". At least "
      <> T.pack (show minSpace)
      <> " MB are recommended, but only "
      <> toMB (fromJust space)
      <> " are free. Consider freeing up disk space or setting TMPDIR env variable.")
    $(logWarn)
      "...waiting for 10 seconds before continuing anyway, you can still abort..."
    liftIO $ threadDelay 10000000 -- give the user a sec to intervene
@@ -287,7 +282,7 @@ mkGhcupTmpDir = do
  liftIO $ createTempDirectory tmpdir "ghcup"
 where
  toBytes mb = mb * 1024 * 1024
-  toMB b = T.pack $ show (truncate' (fromIntegral b / (1024 * 1024) :: Double) 2)
+  toMB b = show (truncate' (fromIntegral b / (1024 * 1024) :: Double) 2)
  truncate' :: Double -> Int -> Double
  truncate' x n = fromIntegral (floor (x * t) :: Integer) / t
      where t = 10^n
@@ -309,7 +304,7 @@ withGHCupTmpDir = snd <$> withRunInIO (\run ->
        (run mkGhcupTmpDir)
        (\fp ->
            handleIO (\e -> run
-                $ $(logDebug) ("Resource cleanup failed for " <> T.pack fp <> ", error was: " <> T.pack (displayException e)))
+                $ $(logDebug) [i|Resource cleanup failed for "#{fp}", error was: #{displayException e}|])
            . rmPathForcibly
            $ fp))
@@ -352,8 +347,8 @@ cleanupTrash = do
  if null contents
  then pure ()
  else do
-    $(logWarn) ("Removing leftover files in " <> T.pack recycleDir)
+    $(logWarn) [i|Removing leftover files in #{recycleDir}|]
    forM_ contents (\fp -> handleIO (\e ->
-        $(logDebug) ("Resource cleanup failed for " <> T.pack fp <> ", error was: " <> T.pack (displayException e))
+        $(logDebug) [i|Resource cleanup failed for "#{fp}", error was: #{displayException e}|]
      ) $ liftIO $ removePathForcibly (recycleDir </> fp))
--- a/lib/GHCup/Utils/File/Common.hs
+++ b/lib/GHCup/Utils/File/Common.hs
@@ -1,3 +1,4 @@
 {-# LANGUAGE QuasiQuotes       #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE TemplateHaskell   #-}
@@ -10,6 +11,7 @@ import           GHCup.Utils.Prelude
 import           Control.Monad.Extra
 import           Control.Monad.Reader
 import           Data.Maybe
 import           Data.String.Interpolate
 import           GHC.IO.Exception
 import           Optics                  hiding ((<|), (|>))
 import           System.Directory
@@ -29,13 +31,13 @@ data ProcessError = NonZeroExit Int FilePath [String]
 instance Pretty ProcessError where
  pPrint (NonZeroExit e exe args) =
-    text "Process " <+> pPrint exe <+> text " with arguments " <+> text (show args) <+> text " failed with exit code " <+> text (show e) <+> "."
+    text [i|Process "#{exe}" with arguments #{args} failed with exit code #{e}.|]
  pPrint (PTerminated exe args) =
-    text "Process " <+> pPrint exe <+> text " with arguments " <+> text (show args) <+> text " terminated."
+    text [i|Process "#{exe}" with arguments #{args} terminated.|]
  pPrint (PStopped exe args) =
-    text "Process " <+> pPrint exe <+> text " with arguments " <+> text (show args) <+> text " stopped."
+    text [i|Process "#{exe}" with arguments #{args} stopped.|]
  pPrint (NoSuchPid exe args) =
-    text "Could not find PID for process running " <+> pPrint exe <+> text " with arguments " <+> text (show args) <+> text "."
+    text [i|Could not find PID for process running "#{exe}" with arguments #{args}.|]
 data CapturedProcess = CapturedProcess
  { _exitCode :: ExitCode
--- a/lib/GHCup/Utils/File/Posix.hs
+++ b/lib/GHCup/Utils/File/Posix.hs
@@ -35,6 +35,7 @@ import           Data.ByteString                ( ByteString )
 import           Data.Foldable
 import           Data.IORef
 import           Data.Sequence                  ( Seq, (|>) )
 import           Data.String.Interpolate
 import           Data.List
 import           Data.Word8
 import           GHC.IO.Exception
@@ -361,7 +362,7 @@ chmod_755 fp = do
            `unionFileModes` groupReadMode
            `unionFileModes` otherExecuteMode
            `unionFileModes` otherReadMode
-  $(logDebug) ("chmod 755 " <> T.pack fp)
+  $(logDebug) [i|chmod 755 #{fp}|]
  liftIO $ setFileMode fp exe_mode
--- a/lib/GHCup/Utils/Prelude.hs
+++ b/lib/GHCup/Utils/Prelude.hs
@@ -5,7 +5,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies        #-}
 {-# LANGUAGE TypeOperators       #-}
 {-# LANGUAGE TemplateHaskell     #-}
 {-|
 Module      : GHCup.Utils.Prelude
@@ -30,7 +29,6 @@ import           Control.Exception.Safe
 import           Control.Monad
 import           Control.Monad.IO.Class
 import           Control.Monad.Reader
 import           Control.Monad.Logger
 import           Data.Bifunctor
 import           Data.ByteString                ( ByteString )
 import           Data.List                      ( nub, intercalate )
@@ -41,7 +39,6 @@ import           Data.Versions
 import           Data.Word8
 import           Haskus.Utils.Types.List
 import           Haskus.Utils.Variant.Excepts
 import           Text.PrettyPrint.HughesPJClass ( prettyShow, Pretty )
 import           System.IO.Error
 #if defined(IS_WINDOWS)
 import           System.IO.Temp
@@ -71,14 +68,6 @@ import qualified System.Win32.File             as Win32
 #endif
 -- $setup
 -- >>> import Data.ByteString.Internal (c2w, w2c)
 -- >>> import Test.QuickCheck
 -- >>> import Data.Word8
 -- >>> import Data.Word8
 -- >>> import qualified Data.Text as T
 -- >>> instance Arbitrary T.Text where arbitrary = T.pack <$> arbitrary
 fS :: IsString a => String -> a
 fS = fromString
@@ -173,10 +162,6 @@ lEM' :: forall e' e es a m
     -> Excepts es m a
 lEM' f em = lift em >>= lE . first f
 -- for some obscure reason... this won't type-check if we move it to a different module
 catchWarn :: forall es m . (Pretty (V es), MonadLogger m, Monad m) => Excepts es m () -> Excepts '[] m ()
 catchWarn = catchAllE @_ @es (\v -> lift $ $(logWarn) (T.pack . prettyShow $ v))
 fromEither :: Either a b -> VEither '[a] b
 fromEither = either (VLeft . V) VRight
@@ -504,14 +489,7 @@ recover action =
 #endif
-- | Gathering monoidal values
+-- Gathering monoidal values
 --
 -- >>> traverseFold (pure . (:["0"])) ["1","2"]
 -- ["1","0","2","0"]
 -- >>> traverseFold Just ["1","2","3","4","5"]
 -- Just "12345"
 --
 -- prop> \t -> traverseFold Just t === Just (mconcat t)
 traverseFold :: (Foldable t, Applicative m, Monoid b) => (a -> m b) -> t a -> m b
 traverseFold f = foldl (\mb a -> (<>) <$> mb <*> f a) (pure mempty)
@@ -521,16 +499,6 @@ forFold = \t -> (`traverseFold` t)
 -- | Strip @\\r@ and @\\n@ from 'ByteString's
 --
 -- >>> stripNewline "foo\n\n\n"
 -- "foo"
 -- >>> stripNewline "foo\r"
 -- "foo"
 -- >>> stripNewline "foo"
 -- "foo"
 --
 -- prop> \t -> stripNewline (t <> "\n") === stripNewline t
 -- prop> \t -> not (any (isNewLine . c2w) t) ==> stripNewline t == t
 stripNewline :: String -> String
 stripNewline s
  | null s               = []
@@ -539,16 +507,6 @@ stripNewline s
 -- | Strip @\\r@ and @\\n@ from 'ByteString's
 --
 -- >>> stripNewline' "foo\n\n\n"
 -- "foo"
 -- >>> stripNewline' "foo\r"
 -- "foo"
 -- >>> stripNewline' "foo"
 -- "foo"
 --
 -- prop> \t -> stripNewline' (t <> "\n") === stripNewline' t
 -- prop> \t -> not (T.any (isNewLine . c2w) t) ==> stripNewline' t == t
 stripNewline' :: T.Text -> T.Text
 stripNewline' s
  | T.null s               = mempty
@@ -556,14 +514,6 @@ stripNewline' s
  | otherwise              = T.singleton (T.head s) <> stripNewline' (T.tail s)
 -- | Is the word8 a newline?
 --
 -- >>> isNewLine (c2w '\n')
 -- True
 -- >>> isNewLine (c2w '\r')
 -- True
 --
 -- prop> \w -> w /= _lf && w /= _cr ==> not (isNewLine w)
 isNewLine :: Word8 -> Bool
 isNewLine w
  | w == _lf = True
@@ -573,10 +523,8 @@ isNewLine w
 -- | Split on a PVP suffix.
 --
-- >>> splitOnPVP "-" "ghc-iserv-dyn-9.3.20210706"
+-- >>> splitOnPVP "-" "ghc-iserv-dyn-9.3.20210706" == ("ghc-iserv-dyn", "9.3.20210706")
-- ("ghc-iserv-dyn","9.3.20210706")
+-- >>> splitOnPVP "-" "ghc-iserv-dyn"              == ("ghc-iserv-dyn", "")
 -- >>> splitOnPVP "-" "ghc-iserv-dyn"
 -- ("ghc-iserv-dyn","")
 splitOnPVP :: String -> String -> (String, String)
 splitOnPVP c s = case Split.splitOn c s of
  []  -> def
--- a/lib/GHCup/Version.hs
+++ b/lib/GHCup/Version.hs
@@ -25,7 +25,7 @@ import qualified Data.Text                     as T
 -- | This reflects the API version of the YAML.
 ghcupURL :: URI
-ghcupURL = [uri|https://www.haskell.org/ghcup/data/ghcup-0.0.7.yaml|]
+ghcupURL = [uri|https://www.haskell.org/ghcup/data/ghcup-0.0.6.yaml|]
 -- | The current ghcup version.
 ghcUpVer :: PVP
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,15 +1,18 @@
-resolver: lts-18.7
+resolver: lts-18.2
 packages:
  - .
 extra-deps:
-  - git: https://github.com/bgamari/terminal-size
+  - git: https://github.com/hasufell/text-conversions.git
-    commit: 34ea816bd63f75f800eedac12c6908c6f3736036
+    commit: 9abf0e5e5664a3178367597c32db19880477a53c
-  - git: https://github.com/hasufell/libarchive
+
-    commit: 024a7e8ab7b4d3848dc64dca1e70a04831eedc99
+  - git: https://github.com/Bodigrim/tar
    commit: ac197ec7ea4838dc2b4e22b9b888b080cedf29cf
  - git: https://github.com/jtdaugherty/brick.git
    commit: b3b96cfe66dfd398d338e3feb2b6855e66a35190
  - brick-0.64@sha256:f03fa14607c22cf48af99e24c44f79a0fb073f7ec229f15e969fed9ff73c93f6,16530
  - IfElse-0.85@sha256:6939b94acc6a55f545f63a168a349dd2fbe4b9a7cca73bf60282db5cc6aa47d2,445
  - ascii-string-1.0.1.4@sha256:fa34f1d9ba57e8e89c0d4c9cef5e01ba32cb2d4373d13f92dcc0b531a6c6749b,2582
  - base16-bytestring-0.1.1.7@sha256:0021256a9628971c08da95cb8f4d0d72192f3bb8a7b30b55c080562d17c43dd3,2231
@@ -28,6 +31,7 @@ extra-deps:
  - hspec-discover-2.7.10@sha256:d08bf5dd785629f589571477d9beb7cd91529471bd89f39517c1cb4b9b38160f,2184
  - hspec-golden-aeson-0.9.0.0@sha256:aa17274114026661ba4dfc9c60c230673c8f408bd86482fd611d2d5cb6aff996,2179
  - http-io-streams-0.1.6.0@sha256:53f5bab177efb52cd65ec396fd04ed59b93e5f919fb3700cd7dacd6cfce6f06d,3582
  - libarchive-3.0.2.1@sha256:40ebf2a278e585802427bc58826867208bb33822f63d56107a1fcc3ca04d691d,10990
  - lzma-static-5.2.5.3@sha256:2758ee58c35992fcf7db78e98684c357a16a82fa2a4e7c352a6c210c08c555d8,7308
  - os-release-1.0.1@sha256:1281c62081f438fc3f0874d3bae6a4887d5964ac25261ba06e29d368ab173467,2716
  - optics-0.4@sha256:9fb69bf0195b8d8f1f8cd0098000946868b8a3c3ffb51e5b64f79fc600c3eb4c,6568
--- a/www/Discord-Logo-Black.svg
+++ b/www/Discord-Logo-Black.svg
@@ -1,10 +0,0 @@
 <svg width="71" height="55" viewBox="0 0 71 55" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0)">
 <path d="M60.1045 4.8978C55.5792 2.8214 50.7265 1.2916 45.6527 0.41542C45.5603 0.39851 45.468 0.440769 45.4204 0.525289C44.7963 1.6353 44.105 3.0834 43.6209 4.2216C38.1637 3.4046 32.7345 3.4046 27.3892 4.2216C26.905 3.0581 26.1886 1.6353 25.5617 0.525289C25.5141 0.443589 25.4218 0.40133 25.3294 0.41542C20.2584 1.2888 15.4057 2.8186 10.8776 4.8978C10.8384 4.9147 10.8048 4.9429 10.7825 4.9795C1.57795 18.7309 -0.943561 32.1443 0.293408 45.3914C0.299005 45.4562 0.335386 45.5182 0.385761 45.5576C6.45866 50.0174 12.3413 52.7249 18.1147 54.5195C18.2071 54.5477 18.305 54.5139 18.3638 54.4378C19.7295 52.5728 20.9469 50.6063 21.9907 48.5383C22.0523 48.4172 21.9935 48.2735 21.8676 48.2256C19.9366 47.4931 18.0979 46.6 16.3292 45.5858C16.1893 45.5041 16.1781 45.304 16.3068 45.2082C16.679 44.9293 17.0513 44.6391 17.4067 44.3461C17.471 44.2926 17.5606 44.2813 17.6362 44.3151C29.2558 49.6202 41.8354 49.6202 53.3179 44.3151C53.3935 44.2785 53.4831 44.2898 53.5502 44.3433C53.9057 44.6363 54.2779 44.9293 54.6529 45.2082C54.7816 45.304 54.7732 45.5041 54.6333 45.5858C52.8646 46.6197 51.0259 47.4931 49.0921 48.2228C48.9662 48.2707 48.9102 48.4172 48.9718 48.5383C50.038 50.6034 51.2554 52.5699 52.5959 54.435C52.6519 54.5139 52.7526 54.5477 52.845 54.5195C58.6464 52.7249 64.529 50.0174 70.6019 45.5576C70.6551 45.5182 70.6887 45.459 70.6943 45.3942C72.1747 30.0791 68.2147 16.7757 60.1968 4.9823C60.1772 4.9429 60.1437 4.9147 60.1045 4.8978ZM23.7259 37.3253C20.2276 37.3253 17.3451 34.1136 17.3451 30.1693C17.3451 26.225 20.1717 23.0133 23.7259 23.0133C27.308 23.0133 30.1626 26.2532 30.1066 30.1693C30.1066 34.1136 27.28 37.3253 23.7259 37.3253ZM47.3178 37.3253C43.8196 37.3253 40.9371 34.1136 40.9371 30.1693C40.9371 26.225 43.7636 23.0133 47.3178 23.0133C50.9 23.0133 53.7545 26.2532 53.6986 30.1693C53.6986 34.1136 50.9 37.3253 47.3178 37.3253Z" fill="#23272A"/>
 </g>
 <defs>
 <clipPath id="clip0">
 <rect width="71" height="55" fill="white"/>
 </clipPath>
 </defs>
 </svg>
--- a/www/Matrix_logo.svg
+++ b/www/Matrix_logo.svg
@@ -1,7 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 75 32" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <title>Matrix (protocol) logo</title>
 <g fill="#040404">
  <path d="m0.936 0.732v30.52h2.194v0.732h-3.035v-31.98h3.034v0.732zm8.45 9.675v1.544h0.044a4.461 4.461 0 0 1 1.487-1.368c0.58-0.323 1.245-0.485 1.993-0.485 0.72 0 1.377 0.14 1.972 0.42 0.595 0.279 1.047 0.771 1.355 1.477 0.338-0.5 0.796-0.941 1.377-1.323 0.58-0.383 1.266-0.574 2.06-0.574 0.602 0 1.16 0.074 1.674 0.22 0.514 0.148 0.954 0.383 1.322 0.707 0.366 0.323 0.653 0.746 0.859 1.268 0.205 0.522 0.308 1.15 0.308 1.887v7.633h-3.127v-6.464c0-0.383-0.015-0.743-0.044-1.082a2.305 2.305 0 0 0-0.242-0.882 1.473 1.473 0 0 0-0.584-0.596c-0.257-0.146-0.606-0.22-1.047-0.22-0.44 0-0.796 0.085-1.068 0.253-0.272 0.17-0.485 0.39-0.639 0.662a2.654 2.654 0 0 0-0.308 0.927 7.074 7.074 0 0 0-0.078 1.048v6.354h-3.128v-6.398c0-0.338-7e-3 -0.673-0.021-1.004a2.825 2.825 0 0 0-0.188-0.916 1.411 1.411 0 0 0-0.55-0.673c-0.258-0.168-0.636-0.253-1.135-0.253a2.33 2.33 0 0 0-0.584 0.1 1.94 1.94 0 0 0-0.705 0.374c-0.228 0.184-0.422 0.449-0.584 0.794-0.161 0.346-0.242 0.798-0.242 1.357v6.619h-3.129v-11.41zm16.46 1.677a3.751 3.751 0 0 1 1.233-1.17 5.37 5.37 0 0 1 1.685-0.629 9.579 9.579 0 0 1 1.884-0.187c0.573 0 1.153 0.04 1.74 0.121 0.588 0.081 1.124 0.24 1.609 0.475 0.484 0.235 0.88 0.562 1.19 0.981 0.308 0.42 0.462 0.975 0.462 1.666v5.934c0 0.516 0.03 1.008 0.088 1.478 0.058 0.471 0.161 0.824 0.308 1.06h-3.171a4.435 4.435 0 0 1-0.22-1.104c-0.5 0.515-1.087 0.876-1.762 1.081a7.084 7.084 0 0 1-2.071 0.31c-0.544 0-1.05-0.067-1.52-0.2a3.472 3.472 0 0 1-1.234-0.617 2.87 2.87 0 0 1-0.826-1.059c-0.199-0.426-0.298-0.934-0.298-1.522 0-0.647 0.114-1.18 0.342-1.6 0.227-0.419 0.52-0.753 0.881-1.004 0.36-0.25 0.771-0.437 1.234-0.562 0.462-0.125 0.929-0.224 1.399-0.298 0.47-0.073 0.932-0.132 1.387-0.176 0.456-0.044 0.86-0.11 1.212-0.199 0.353-0.088 0.631-0.217 0.837-0.386s0.301-0.415 0.287-0.74c0-0.337-0.055-0.606-0.166-0.804a1.217 1.217 0 0 0-0.44-0.464 1.737 1.737 0 0 0-0.639-0.22 5.292 5.292 0 0 0-0.782-0.055c-0.617 0-1.101 0.132-1.454 0.397-0.352 0.264-0.558 0.706-0.617 1.323h-3.128c0.044-0.735 0.227-1.345 0.55-1.83zm6.179 4.423a5.095 5.095 0 0 1-0.639 0.165 9.68 9.68 0 0 1-0.716 0.11c-0.25 0.03-0.5 0.067-0.749 0.11a5.616 5.616 0 0 0-0.694 0.177 2.057 2.057 0 0 0-0.594 0.298c-0.17 0.125-0.305 0.284-0.408 0.474-0.103 0.192-0.154 0.434-0.154 0.728 0 0.28 0.051 0.515 0.154 0.706 0.103 0.192 0.242 0.342 0.419 0.453 0.176 0.11 0.381 0.187 0.617 0.231 0.234 0.044 0.477 0.066 0.726 0.066 0.617 0 1.094-0.102 1.432-0.309 0.338-0.205 0.587-0.452 0.75-0.739 0.16-0.286 0.26-0.576 0.297-0.87 0.036-0.295 0.055-0.53 0.055-0.707v-1.17a1.4 1.4 0 0 1-0.496 0.277zm11.86-6.1v2.096h-2.291v5.647c0 0.53 0.088 0.883 0.264 1.059 0.176 0.177 0.529 0.265 1.057 0.265 0.177 0 0.345-7e-3 0.507-0.022 0.161-0.015 0.316-0.037 0.463-0.066v2.426a7.49 7.49 0 0 1-0.882 0.089 21.67 21.67 0 0 1-0.947 0.022c-0.484 0-0.944-0.034-1.377-0.1a3.233 3.233 0 0 1-1.145-0.386 2.04 2.04 0 0 1-0.782-0.816c-0.191-0.353-0.287-0.816-0.287-1.39v-6.728h-1.894v-2.096h1.894v-3.42h3.129v3.42h2.29zm4.471 0v2.118h0.044a3.907 3.907 0 0 1 1.454-1.754 4.213 4.213 0 0 1 1.036-0.497 3.734 3.734 0 0 1 1.145-0.176c0.206 0 0.433 0.037 0.683 0.11v2.912a5.862 5.862 0 0 0-0.528-0.077 5.566 5.566 0 0 0-0.595-0.033c-0.573 0-1.058 0.096-1.454 0.287a2.52 2.52 0 0 0-0.958 0.783 3.143 3.143 0 0 0-0.518 1.158 6.32 6.32 0 0 0-0.154 1.434v5.14h-3.128v-11.4zm5.684-1.765v-2.582h3.128v2.582h-3.127zm3.128 1.765v11.4h-3.127v-11.4h3.128zm1.63 0h3.569l2.005 2.978 1.982-2.978h3.459l-3.745 5.339 4.208 6.067h-3.57l-2.378-3.596-2.38 3.596h-3.502l4.097-6.001zm15.3 20.84v-30.52h-2.194v-0.732h3.035v31.98h-3.035v-0.732z"/>
 </g>
 </svg>
--- a/www/Octicons-bug.svg
+++ b/www/Octicons-bug.svg
@@ -1,36 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
   height="800.3468"
   width="733.88495"
   version="1.1"
   id="svg4"
   sodipodi:docname="Octicons-bug.svg"
   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg">
  <defs
     id="defs8" />
  <sodipodi:namedview
     id="namedview6"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageshadow="2"
     inkscape:pageopacity="0.0"
     inkscape:pagecheckerboard="0"
     showgrid="false"
     inkscape:zoom="0.85253906"
     inkscape:cx="367.1386"
     inkscape:cy="432.23826"
     inkscape:window-width="3828"
     inkscape:window-height="2081"
     inkscape:window-x="0"
     inkscape:window-y="46"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg4" />
  <path
     d="m 243.6206,76.877783 c -52.874,56.780997 -38.281,147.468997 -38.281,147.468997 0,0 53.968,64 160,64 106.031,0 160.031,-64 160.031,-64 0,0 14.375,-89.469 -37.375,-146.311997 32.375,-18.031 51.438,-44.094 43.562,-61.812 -8.938,-19.9689999 -48.375,-21.7499999 -88.25,-3.969 -14.812,6.594 -27.438,14.969 -37.25,23.875 -12.438,-2.25 -25.625,-3.781 -40.72,-3.781 -14.061,0 -26.561,1.344 -38.344,3.25 -9.656,-8.75 -22.062,-16.875 -36.531,-23.344 -39.875,-17.7189999 -79.375,-15.9379999 -88.25,3.969 -7.748,17.343 10.284,42.686 41.408,60.655 z m 401.125,413.218997 c -8.25,-1.75 -16.125,-2.75 -23.75,-3.5 0,-2.125 0.375,-4.125 0.375,-6.312 0,-33.594 -4.75,-65.654 -12.438,-96.125 16.438,1.406 37.375,-2.375 58.562,-11.779 39.875,-17.781 65,-48.375 56.125,-68.219 -8.875,-19.969 -48.375,-21.75 -88.25,-3.969 -18.625,8.312 -33.812,19.469 -44,30.906 -7.75,-18.25 -16.5,-35.781 -26.812,-51.719 -30.188,25.156 -87.312,62.719 -167.062,71.062 v 321.781 c 0,0 -0.25,32 -32.031,32 -31.75,0 -32,-32 -32,-32 v -321.657 c -79.811,-8.344 -136.968,-45.969 -167.093,-71.062 -9.875,15.312 -18.375,32 -25.938,49.344 -10.281,-10.625 -24.625,-20.844 -41.969,-28.594 -39.875,-17.719 -79.375,-15.938 -88.25,3.969 -8.9060001,19.906 16.25,50.438 56.125,68.219 19.844,8.846 39.531,12.812 55.469,12.096 -7.656,30.404 -12.469,62.344 -12.469,95.812 0,2.188 0.375,4.25 0.438,6.5 -6.719,0.75 -13.688,1.75 -20.781,3.25 -51.969,10.75 -91.7810001,37.625 -88.84400014,59.812 2.93800004,22.312 47.50000014,31.5 99.59400014,20.688 6.781,-1.375 13.438,-3.125 19.781,-5.062 9.156,40.809 23.812,78.684 44.094,111.309 -12.031,6.062 -24.531,15 -36.031,26.625 -31.876,31.875 -44.812,70.625 -28.876,86.563 15.938,15.937 54.656,3 86.531,-28.812 9.344,-9.375 16.844,-19.25 22.656,-29 43.532,42.624 98.063,68.124 157.563,68.124 60.343,0 115.781,-26.25 159.531,-69.938 5.875,10.312 13.75,20.812 23.625,30.688 31.812,31.875 70.625,44.812 86.562,28.875 15.937,-15.937 3,-54.625 -28.875,-86.5 -12.312,-12.375 -25.688,-21.75 -38.438,-27.938 20.125,-32.5 34.625,-70.375 43.688,-111.062 7.188,2.25 14.688,4.375 22.562,6.062 52.061,10.812 96.625,1.562 99.625,-20.688 2.813,-22.124 -36.999,-48.999 -88.999,-59.749 z"
     id="path2" />
 </svg>
--- a/www/index.html
+++ b/www/index.html
@@ -138,12 +138,12 @@
      </div>
      <p>
-	  Need help? Ask on <a href="https://kiwiirc.com/nextclient/irc.libera.chat/?nick=Guest%7C?#haskell,#haskell-ghcup"><img src="irc.svg" height="18px" alt="" />IRC</a>, <a href="https://discord.gg/pKYf3zDQU7"><img src="Discord-Logo-Black.svg" height="18px" alt="" />Discord</a>, <a href="https://app.element.io/#/room/#haskell-tooling:matrix.org"><img src="Matrix_logo.svg" height="25px" alt="" style="top:5px;position:relative;" /></a> or <a href="https://gitlab.haskell.org/haskell/ghcup-hs/issues">report a bug <img src="Octicons-bug.svg" height="18px" alt="" /></a>.
+        Need help? Ask on <a href="https://kiwiirc.com/nextclient/irc.libera.chat/#haskell-ghcup">#haskell-ghcup</a>, <a href="https://kiwiirc.com/nextclient/irc.libera.chat/#haskell">#haskell</a> or <a href="https://gitlab.haskell.org/haskell/ghcup-hs/issues">report a bug</a>.
      </p>
      <p id="about">
        <img src="haskell-logo.svg" alt="" />
-        ghcup is a haskell.org supported project.
+        ghcup is a haskell.org hosted project.
        <br/>
        <a href="https://www.haskell.org/downloads/">other installation options</a>
        &nbsp;&middot;&nbsp;
--- a/www/irc.svg
+++ b/www/irc.svg
@@ -1,38 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
   height="18.043058"
   viewBox="0 0 18 18.043058"
   width="18"
   version="1.1"
   id="svg4"
   sodipodi:docname="irc.svg"
   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg">
  <defs
     id="defs8" />
  <sodipodi:namedview
     id="namedview6"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageshadow="2"
     inkscape:pageopacity="0.0"
     inkscape:pagecheckerboard="0"
     showgrid="false"
     inkscape:zoom="36.375"
     inkscape:cx="3.3814433"
     inkscape:cy="9.0309278"
     inkscape:window-width="3828"
     inkscape:window-height="2081"
     inkscape:window-x="0"
     inkscape:window-y="46"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg4" />
  <path
     class="heroicon-ui"
     d="m 8.03,5.0375961 h 3.94 l 1.06,-4.23999995 a 1,1 0 1 1 1.94,0.47999995 l -0.94,3.76 H 17 a 1,1 0 0 1 0,2 h -3.47 l -1,3.9999999 H 15 a 1,1 0 1 1 0,2 h -2.97 l -1.06,4.25 a 1.0004624,1.0004624 0 1 1 -1.94,-0.49 l 0.94,-3.76 H 6.03 l -1.06,4.25 a 1.0004624,1.0004624 0 1 1 -1.94,-0.49 l 0.94,-3.76 H 1 a 1,1 0 0 1 0,-2 h 3.47 l 1,-3.9999999 H 3 a 1,1 0 0 1 0,-2 H 5.97 L 7.03,0.79759615 A 1,1 0 1 1 8.97,1.2775961 Z m -0.5,2 -1,3.9999999 h 3.94 l 1,-3.9999999 z"
     id="path2" />
 </svg>